Autogenerated HTML docs for v2.49.0-411-ga2955
diff --git a/MyFirstContribution.html b/MyFirstContribution.html index 34f26b2..f558ae5 100644 --- a/MyFirstContribution.html +++ b/MyFirstContribution.html
@@ -999,9 +999,9 @@ </div> </div> <div class="paragraph"> -<p>The <code>struct</code> <code>strbuf</code> provides some safety belts to your basic <code>char</code>*, one of +<p>The <code>struct</code> <code>strbuf</code> provides some safety belts to your basic <code>char*</code>, one of which is a length member to prevent buffer overruns. It needs to be initialized -nicely with <code>STRBUF_INIT</code>. Keep it in mind when you need to pass around <code>char</code>*.</p> +nicely with <code>STRBUF_INIT</code>. Keep it in mind when you need to pass around <code>char*</code>.</p> </div> <div class="paragraph"> <p><code>lookup_commit_reference_by_name</code> resolves the name you pass it, so you can play @@ -1041,7 +1041,7 @@ <p>Your new command is undocumented! Let’s fix that.</p> </div> <div class="paragraph"> -<p>Take a look at <code>Documentation/git-</code>*.<code>adoc</code>. These are the manpages for the +<p>Take a look at <code>Documentation/git-*.adoc</code>. These are the manpages for the subcommands that Git knows about. You can open these up and take a look to get acquainted with the format, but then go ahead and make a new file <code>Documentation/git-psuh.adoc</code>. Like with most of the documentation in the Git @@ -1897,7 +1897,7 @@ <td class="content"> If you’re not sure whom to CC, running <code>contrib/contacts/git-contacts</code> can list potential reviewers. In addition, you can do <code>git</code> <code>send-email</code> -<code>--cc-cmd=</code>'perl <code>contrib/contacts/git-contacts</code>' <code>feature/</code>*.<code>patch</code><sup class="footnote" id="_footnote_contrib-scripts">[<a id="_footnoteref_1" class="footnote" href="#_footnotedef_1" title="View footnote.">1</a>]</sup> to +<code>--cc-cmd=</code>'perl <code>contrib/contacts/git-contacts</code>' <code>feature/*.patch</code><sup class="footnote" id="_footnote_contrib-scripts">[<a id="_footnoteref_1" class="footnote" href="#_footnotedef_1" title="View footnote.">1</a>]</sup> to automatically pass this list of emails to <code>send-email</code>. </td> </tr> @@ -1973,7 +1973,7 @@ directory, alongside the v1 patches. Using a single directory makes it easy to refer to the old v1 patches while proofreading the v2 patches, but you will need to be careful to send out only the v2 patches. We will use a pattern like -<code>psuh/v2-</code>*.<code>patch</code> (not <code>psuh/</code>*.<code>patch</code>, which would match v1 and v2 patches).</p> +<code>psuh/v2-*.patch</code> (not <code>psuh/*.patch</code>, which would match v1 and v2 patches).</p> </div> <div class="paragraph"> <p>Edit your cover letter again. Now is a good time to mention what’s different @@ -2239,7 +2239,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2025-03-10 09:41:59 -0700 +Last updated 2025-03-26 00:41:02 -0700 </div> </div> </body>
diff --git a/MyFirstObjectWalk.html b/MyFirstObjectWalk.html index 2720b85..5b6839a 100644 --- a/MyFirstObjectWalk.html +++ b/MyFirstObjectWalk.html
@@ -956,7 +956,7 @@ <div class="title">Note</div> </td> <td class="content"> -<code>puts</code>() prints a <code>char</code>* to <code>stdout</code>. Since this is the part of the +<code>puts</code>() prints a <code>char*</code> to <code>stdout</code>. Since this is the part of the command we expect to be machine-parsed, we’re sending it directly to stdout. </td> </tr> @@ -1184,7 +1184,7 @@ <div class="ulist"> <ul> <li> -<p><code>struct</code> <code>rev_info</code> *revs: This is the <code>rev_info</code> used for the walk. If +<p><code>struct</code> <code>rev_info</code> <code>*revs</code>: This is the <code>rev_info</code> used for the walk. If its <code>filter</code> member is not <code>NULL</code>, then <code>filter</code> contains information for how to filter the object list.</p> </li> @@ -1197,7 +1197,7 @@ non-commit object (so each blob, tree, or tag).</p> </li> <li> -<p><code>void</code> *show_data: A context buffer which is passed in turn to <code>show_commit</code> +<p><code>void</code> <code>*show_data</code>: A context buffer which is passed in turn to <code>show_commit</code> and <code>show_object</code>.</p> </li> </ul> @@ -1208,7 +1208,7 @@ <div class="ulist"> <ul> <li> -<p><code>struct</code> <code>oidset</code> *omitted: A linked-list of object IDs which the provided +<p><code>struct</code> <code>oidset</code> <code>*omitted</code>: A linked-list of object IDs which the provided filter caused to be omitted.</p> </li> </ul> @@ -1675,7 +1675,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2025-03-10 09:41:59 -0700 +Last updated 2025-03-26 00:41:02 -0700 </div> </div> </body>
diff --git a/RelNotes/2.50.0.adoc b/RelNotes/2.50.0.adoc index f13e646..e4b731e 100644 --- a/RelNotes/2.50.0.adoc +++ b/RelNotes/2.50.0.adoc
@@ -110,6 +110,8 @@ * Remove remnants of the recursive merge strategy backend, which was superseded by the ort merge strategy. + * Optimize the code to dedup references recorded in a bundle file. + Fixes since v2.49 ----------------- @@ -195,6 +197,19 @@ * Incorrect sorting of refs with bytes with high-bit set on platforms with signed char led to a BUG, which has been corrected. + * "make perf" fixes. + (merge 1665f12fa0 pb/perf-test-fixes later to maint). + + * Doc mark-up updates. + (merge 5a5565ec44 ja/doc-reset-mv-rm-markup-updates later to maint). + + * Work around false positive from CodeQL checker. + (merge 0f558141ed js/range-check-codeql-workaround later to maint). + + * "git log --{left,right}-only A...B", when A and B does not share + any common ancestor, now behaves as expected. + (merge e7ef4be7c2 mh/left-right-limited later to maint). + * Other code cleanup, docfix, build fix, etc. (merge 227c4f33a0 ja/doc-block-delimiter-markup-fix later to maint). (merge 2bfd3b3685 ab/decorate-code-cleanup later to maint). diff --git a/SubmittingPatches.html b/SubmittingPatches.html index 6c74267..b69e1c6 100644 --- a/SubmittingPatches.html +++ b/SubmittingPatches.html
@@ -1552,11 +1552,11 @@ <div class="sect2"> <h3 id="_gnus">Gnus</h3> <div class="paragraph"> -<p>"|" in the *Summary* buffer can be used to pipe the current +<p>"|" in the <code>*Summary*</code> buffer can be used to pipe the current message to an external program, and this is a handy way to drive <code>git</code> <code>am</code>. However, if the message is MIME encoded, what is piped into the program is the representation you see in your -*Article* buffer after unwrapping MIME. This is often not what +<code>*Article*</code> buffer after unwrapping MIME. This is often not what you would want for two reasons. It tends to screw up non-ASCII characters (most notably in people’s names), and also whitespaces (fatal in patches). Running "C-u g" to display the
diff --git a/git-add.html b/git-add.html index 0de349d..d4906c8 100644 --- a/git-add.html +++ b/git-add.html
@@ -509,7 +509,7 @@ <dl> <dt class="hdlist1"><em><pathspec></em>...</dt> <dd> -<p>Files to add content from. Fileglobs (e.g. *.<code>c</code>) can +<p>Files to add content from. Fileglobs (e.g. <code>*.c</code>) can be given to add all matching files. Also a leading directory name (e.g. <code>dir</code> to add <code>dir/file1</code> and <code>dir/file2</code>) can be given to update the index to @@ -709,7 +709,7 @@ <div class="ulist"> <ul> <li> -<p>Adds content from all *.<code>txt</code> files under <code>Documentation</code> directory +<p>Adds content from all <code>*.txt</code> files under <code>Documentation</code> directory and its subdirectories:</p> <div class="listingblock"> <div class="content"> @@ -717,13 +717,13 @@ </div> </div> <div class="paragraph"> -<p>Note that the asterisk * is quoted from the shell in this +<p>Note that the asterisk <code>*</code> is quoted from the shell in this example; this lets the command include the files from subdirectories of <code>Documentation/</code> directory.</p> </div> </li> <li> -<p>Considers adding content from all <code>git-</code>*.<code>sh</code> scripts:</p> +<p>Considers adding content from all <code>git-*.sh</code> scripts:</p> <div class="listingblock"> <div class="content"> <pre>$ git add git-*.sh</pre>
diff --git a/git-am.html b/git-am.html index d4f8d65..6f7a1f5 100644 --- a/git-am.html +++ b/git-am.html
@@ -832,7 +832,7 @@ <dd> <p>If true, git-am will call git-mailsplit for patches in mbox format with parameter <code>--keep-cr</code>. In this case git-mailsplit will -not remove \r from lines ending with \r\n. Can be overridden +not remove <code>\r</code> from lines ending with <code>\r\n</code>. Can be overridden by giving <code>--no-keep-cr</code> from the command line. See <a href="git-am.html">git-am(1)</a>, <a href="git-mailsplit.html">git-mailsplit(1)</a>.</p> </dd>
diff --git a/git-check-ref-format.html b/git-check-ref-format.html index a4d62a6..7b93f66 100644 --- a/git-check-ref-format.html +++ b/git-check-ref-format.html
@@ -491,7 +491,7 @@ is waived.</p> </li> <li> -<p>They cannot have two consecutive dots .. anywhere.</p> +<p>They cannot have two consecutive dots <code>..</code> anywhere.</p> </li> <li> <p>They cannot have ASCII control characters (i.e. bytes whose @@ -499,7 +499,7 @@ caret <code>^</code>, or colon <code>:</code> anywhere.</p> </li> <li> -<p>They cannot have question-mark ?, asterisk *, or open +<p>They cannot have question-mark ?, asterisk <code>*</code>, or open bracket [ anywhere. See the <code>--refspec-pattern</code> option below for an exception to this rule.</p> </li> @@ -518,7 +518,7 @@ <p>They cannot be the single character <code>@</code>.</p> </li> <li> -<p>They cannot contain a \.</p> +<p>They cannot contain a <code>\</code>.</p> </li> </ol> </div> @@ -531,7 +531,7 @@ <div class="olist arabic"> <ol class="arabic"> <li> -<p>A double-dot .. is often used as in <code>ref1</code><code>..</code><code>ref2</code>, and in some +<p>A double-dot <code>..</code> is often used as in <code>ref1</code><code>..</code><code>ref2</code>, and in some contexts this notation means <code>^ref1</code> <code>ref2</code> (i.e. not in <code>ref1</code> and in <code>ref2</code>).</p> </li> @@ -587,9 +587,9 @@ <dd> <p>Interpret <refname> as a reference name pattern for a refspec (as used with remote repositories). If this option is -enabled, <refname> is allowed to contain a single * -in the refspec (e.g., <code>foo/bar</code>*/baz or <code>foo/bar</code>*baz/ -but not <code>foo/bar</code>*/baz*).</p> +enabled, <refname> is allowed to contain a single <code>*</code> +in the refspec (e.g., <code>foo/bar*/baz</code> or <code>foo/bar*baz/</code> +but not <code>foo/bar*/baz*</code>).</p> </dd> <dt class="hdlist1">--normalize</dt> <dd>
diff --git a/git-checkout-index.html b/git-checkout-index.html index 2472811..93d594e 100644 --- a/git-checkout-index.html +++ b/git-checkout-index.html
@@ -562,7 +562,7 @@ </div> </div> <div class="paragraph"> -<p>which will force all existing *.<code>h</code> files to be replaced with their +<p>which will force all existing <code>*.h</code> files to be replaced with their cached copies. If an empty command line implied "all", then this would force-refresh everything in the index, which was not the point. But since <em>git checkout-index</em> accepts --stdin it would be faster to use:</p>
diff --git a/git-checkout.html b/git-checkout.html index ba9e71d..74cce9c 100644 --- a/git-checkout.html +++ b/git-checkout.html
@@ -1112,7 +1112,7 @@ </div> </div> <div class="paragraph"> -<p>Note the quotes around *.<code>c</code>. The file <code>hello.c</code> will also be +<p>Note the quotes around <code>*.c</code>. The file <code>hello.c</code> will also be checked out, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell).</p>
diff --git a/git-clone.html b/git-clone.html index 8e5b575..fdeee22 100644 --- a/git-clone.html +++ b/git-clone.html
@@ -863,7 +863,7 @@ <dd> <p>Before fetching from the remote, fetch a bundle from the given <em><uri></em> and unbundle the data into the local repository. The refs -in the bundle will be stored under the hidden <code>refs/bundle/</code>* +in the bundle will be stored under the hidden <code>refs/bundle/*</code> namespace. This option is incompatible with <code>--depth</code>, <code>--shallow-since</code>, and <code>--shallow-exclude</code>.</p> </dd>
diff --git a/git-commit.html b/git-commit.html index 5bb63a9..64bb24f 100644 --- a/git-commit.html +++ b/git-commit.html
@@ -705,11 +705,11 @@ <dt class="hdlist1"><code>--trailer</code> <em><token></em>[(<code>=</code>|<code>:</code>)<em><value></em>]</dt> <dd> <p>Specify a (<em><token></em>, <em><value></em>) pair that should be applied as a -trailer. (e.g. <code>git</code> <code>commit</code> <code>--trailer</code> "Signed-off-by:C <code>O</code> <code>Mitter</code> \ -<committer@example.<code>com</code>>" <code>--trailer</code> "Helped-by:C <code>O</code> <code>Mitter</code> \ +trailer. (e.g. <code>git</code> <code>commit</code> <code>--trailer</code> "Signed-off-by:C <code>O</code> <code>Mitter</code> <code>\</code> +<committer@example.<code>com</code>>" <code>--trailer</code> "Helped-by:C <code>O</code> <code>Mitter</code> <code>\</code> <committer@example.<code>com</code>>" will add the <code>Signed-off-by</code> trailer and the <code>Helped-by</code> trailer to the commit message.) -The <code>trailer.</code>* configuration variables +The <code>trailer.*</code> configuration variables (<a href="git-interpret-trailers.html">git-interpret-trailers(1)</a>) can be used to define if a duplicated trailer is omitted, where in the run of trailers each trailer would appear, and other details.</p>
diff --git a/git-config.html b/git-config.html index 73a2b44..20b4a46 100644 --- a/git-config.html +++ b/git-config.html
@@ -816,7 +816,7 @@ </dd> <dt class="hdlist1">--[no-]includes</dt> <dd> -<p>Respect <code>include.</code>* directives in config files when looking up +<p>Respect <code>include.*</code> directives in config files when looking up values. Defaults to <code>off</code> when a specific file is given (e.g., using <code>--file</code>, <code>--global</code>, etc) and <code>on</code> when searching all config files.</p> @@ -1306,9 +1306,9 @@ <div class="paragraph"> <p>Subsection names are case sensitive and can contain any characters except newline and the null byte. Doublequote " and backslash can be included -by escaping them as \" and \\, respectively. Backslashes preceding -other characters are dropped when reading; for example, \t is read as -<code>t</code> and \0 is read as <code>0</code>. Section headers cannot span multiple lines. +by escaping them as <code>\</code>" and <code>\\</code>, respectively. Backslashes preceding +other characters are dropped when reading; for example, <code>\t</code> is read as +<code>t</code> and <code>\0</code> is read as <code>0</code>. Section headers cannot span multiple lines. Variables may belong directly to a section or to a given subsection. You can have [<code>section</code>] if you have [<code>section</code> "subsection"], but you don’t need to.</p> @@ -1332,19 +1332,19 @@ Internal whitespace characters within <em>value</em> are retained verbatim. Comments starting with either # or ; and extending to the end of line are discarded. A line that defines a value can be continued to the next -line by ending it with a backslash (\); the backslash and the end-of-line +line by ending it with a backslash (<code>\</code>); the backslash and the end-of-line characters are discarded.</p> </div> <div class="paragraph"> <p>If <code>value</code> needs to contain leading or trailing whitespace characters, it must be enclosed in double quotation marks ("). Inside double quotation -marks, double quote (") and backslash (\) characters must be escaped: -use \" for " and \\ for \.</p> +marks, double quote (") and backslash (<code>\</code>) characters must be escaped: +use <code>\</code>" for " and <code>\\</code> for <code>\</code>.</p> </div> <div class="paragraph"> -<p>The following escape sequences (beside \" and \\) are recognized: -\n for newline character (NL), \t for horizontal tabulation (HT, TAB) -and \b for backspace (BS). Other char escape sequences (including octal +<p>The following escape sequences (beside <code>\</code>" and <code>\\</code>) are recognized: +<code>\n</code> for newline character (NL), <code>\t</code> for horizontal tabulation (HT, TAB) +and <code>\b</code> for backspace (BS). Other char escape sequences (including octal escape sequences) are invalid.</p> </div> </div> @@ -1359,7 +1359,7 @@ </div> <div class="paragraph"> <p>You can include a config file from another by setting the special -<code>include.path</code> (or <code>includeIf.</code>*.<code>path</code>) variable to the name of the file +<code>include.path</code> (or <code>includeIf.*.path</code>) variable to the name of the file to be included. The variable takes a pathname as its value, and is subject to tilde expansion. These variables can be given multiple times.</p> </div> @@ -1399,7 +1399,7 @@ </div> <div class="paragraph"> <p>The pattern can contain standard globbing wildcards and two additional -ones, **/ and <code>/</code>**, that can match multiple path components. Please +ones, <code>**/</code> and <code>/**</code>, that can match multiple path components. Please refer to <a href="gitignore.html">gitignore(5)</a> for details. For convenience:</p> </div> <div class="ulist"> @@ -1413,13 +1413,13 @@ containing the current config file.</p> </li> <li> -<p>If the pattern does not start with either <code>~/</code>, .<code>/</code> or <code>/</code>, **/ +<p>If the pattern does not start with either <code>~/</code>, .<code>/</code> or <code>/</code>, <code>**/</code> will be automatically prepended. For example, the pattern <code>foo/bar</code> -becomes **/foo/bar and would match <code>/any/path/to/foo/bar</code>.</p> +becomes <code>**/foo/bar</code> and would match <code>/any/path/to/foo/bar</code>.</p> </li> <li> -<p>If the pattern ends with <code>/</code>, ** will be automatically added. For -example, the pattern <code>foo/</code> becomes <code>foo/</code>**. In other words, it +<p>If the pattern ends with <code>/</code>, <code>**</code> will be automatically added. For +example, the pattern <code>foo/</code> becomes <code>foo/**</code>. In other words, it matches "foo" and everything inside, recursively.</p> </li> </ul> @@ -1434,23 +1434,23 @@ <dd> <p>The data that follows the keyword <code>onbranch:</code> is taken to be a pattern with standard globbing wildcards and two additional -ones, **/ and <code>/</code>**, that can match multiple path components. +ones, <code>**/</code> and <code>/**</code>, that can match multiple path components. If we are in a worktree where the name of the branch that is currently checked out matches the pattern, the include condition is met.</p> <div class="paragraph"> -<p>If the pattern ends with <code>/</code>, ** will be automatically added. For -example, the pattern <code>foo/</code> becomes <code>foo/</code>**. In other words, it matches +<p>If the pattern ends with <code>/</code>, <code>**</code> will be automatically added. For +example, the pattern <code>foo/</code> becomes <code>foo/**</code>. In other words, it matches all branches that begin with <code>foo/</code>. This is useful if your branches are organized hierarchically and you would like to apply a configuration to all the branches in that hierarchy.</p> </div> </dd> -<dt class="hdlist1"><code>hasconfig:remote.</code>*.<code>url:</code></dt> +<dt class="hdlist1"><code>hasconfig:remote.*.url:</code></dt> <dd> <p>The data that follows this keyword is taken to be a pattern with standard globbing wildcards and two -additional ones, **/ and <code>/</code>**, that can match multiple +additional ones, <code>**/</code> and <code>/**</code>, that can match multiple components. The first time this keyword is seen, the rest of the config files will be scanned for remote URLs (without applying any values). If there exists at least one remote URL @@ -1855,7 +1855,7 @@ guess based on the source and destination refs what remote ref namespace the source belongs in, but where we can still suggest that the user push to either -<code>refs/heads/</code>* or <code>refs/tags/</code>* based on the type of the +<code>refs/heads/*</code> or <code>refs/tags/*</code> based on the type of the source object.</p> </dd> <dt class="hdlist1">pushUpdateRejected</dt> @@ -2040,7 +2040,7 @@ <dd> <p>If true, git-am will call git-mailsplit for patches in mbox format with parameter <code>--keep-cr</code>. In this case git-mailsplit will -not remove \r from lines ending with \r\n. Can be overridden +not remove <code>\r</code> from lines ending with <code>\r\n</code>. Can be overridden by giving <code>--no-keep-cr</code> from the command line. See <a href="git-am.html">git-am(1)</a>, <a href="git-mailsplit.html">git-mailsplit(1)</a>.</p> </dd> @@ -2084,7 +2084,7 @@ <div class="title">Note</div> </td> <td class="content"> -The configuration options in <code>bitmapPseudoMerge.</code>* are considered +The configuration options in <code>bitmapPseudoMerge.*</code> are considered EXPERIMENTAL and may be subject to change or be removed entirely in the future. For more information about the pseudo-merge bitmap feature, see the "Pseudo-merge bitmaps" section of <a href="gitpacking.html">gitpacking(7)</a>. @@ -2126,7 +2126,7 @@ <dd> <p>Determines the rate at which consecutive pseudo-merge bitmap groups decrease in size. Must be non-negative. This parameter -can be thought of as <code>k</code> in the function <code>f</code>(<code>n</code>) <code>=</code> <code>C</code> * <code>n^-k</code>, +can be thought of as <code>k</code> in the function <code>f</code>(<code>n</code>) <code>=</code> <code>C</code> <code>*</code> <code>n^-k</code>, where <code>f</code>(<code>n</code>) is the size of the `n`th group.</p> <div class="paragraph"> <p>Setting the decay rate equal to <code>0</code> will cause all groups to be the @@ -2409,7 +2409,7 @@ </dd> <dt class="hdlist1">bundle.*</dt> <dd> -<p>The <code>bundle.</code>* keys may appear in a bundle list file found via the +<p>The <code>bundle.*</code> keys may appear in a bundle list file found via the <code>git</code> <code>clone</code> <code>--bundle-uri</code> option. These keys currently have no effect if placed in a repository config file, though this will change in the future. See <a href="technical/bundle-uri.html">the bundle URI design @@ -2437,7 +2437,7 @@ </dd> <dt class="hdlist1">bundle.<id>.*</dt> <dd> -<p>The <code>bundle.</code><em><id></em>.* keys are used to describe a single item in the +<p>The <code>bundle.</code><em><id></em><code>.*</code> keys are used to describe a single item in the bundle list, grouped under <em><id></em> for identification purposes.</p> </dd> <dt class="hdlist1">bundle.<id>.uri</dt> @@ -2523,7 +2523,7 @@ <dt class="hdlist1">color.advice</dt> <dd> <p>A boolean to enable/disable color in hints (e.g. when a push -failed, see <code>advice.</code>* for a list). May be set to <code>always</code>, +failed, see <code>advice.*</code> for a list). May be set to <code>always</code>, <code>false</code> (or <code>never</code>) or <code>auto</code> (or <code>true</code>), in which case colors are used only when the error output goes to a terminal. If unset, then the value of <code>color.ui</code> is used (<code>auto</code> by default).</p> @@ -3154,8 +3154,8 @@ quote "unusual" characters in the pathname by enclosing the pathname in double-quotes and escaping those characters with backslashes in the same way C escapes control characters (e.g. -\t for TAB, \n for LF, \\ for backslash) or bytes with -values larger than 0x80 (e.g. octal \302\265 for "micro" in +<code>\t</code> for TAB, <code>\n</code> for LF, <code>\\</code> for backslash) or bytes with +values larger than 0x80 (e.g. octal <code>\302\265</code> for "micro" in UTF-8). If this variable is set to false, bytes higher than 0x80 are not considered "unusual" any more. Double-quotes, backslash and control characters are always escaped regardless @@ -4015,7 +4015,7 @@ natural concept of lines). This is a more expensive <code>--dirstat</code> behavior than the <code>changes</code> behavior, but it does count rearranged lines within a file as much as other changes. The resulting output -is consistent with what you get from the other <code>--</code>*stat options.</p> +is consistent with what you get from the other <code>--*stat</code> options.</p> </dd> <dt class="hdlist1"><code>files</code></dt> <dd> @@ -4720,7 +4720,7 @@ <dt class="hdlist1">fetch.pruneTags</dt> <dd> <p>If true, fetch will automatically behave as if the -<code>refs/tags/</code>*:refs/tags/* refspec was provided when pruning, +<code>refs/tags/*:refs/tags/*</code> refspec was provided when pruning, if not set already. This allows for setting both this option and <code>fetch.prune</code> to maintain a 1=1 mapping to upstream refs. See also <code>remote.</code><em><name></em><code>.pruneTags</code> and the PRUNING @@ -5022,9 +5022,9 @@ to clone or fetch it set <code>fetch.fsck.</code><em><msg-id></em>.</p> </div> <div class="paragraph"> -<p>The rest of the documentation discusses <code>fsck.</code>* for brevity, but the -same applies for the corresponding <code>receive.fsck.</code>* and -<code>fetch.fsck.</code>*. variables.</p> +<p>The rest of the documentation discusses <code>fsck.*</code> for brevity, but the +same applies for the corresponding <code>receive.fsck.*</code> and +<code>fetch.fsck.*</code>. variables.</p> </div> <div class="paragraph"> <p>Unlike variables like <code>color.ui</code> and <code>core.editor</code>, the @@ -5146,7 +5146,7 @@ <dt class="hdlist1">gc.autoPackLimit</dt> <dd> <p>When there are more than this many packs that are not -marked with *.<code>keep</code> file in the repository, <code>git</code> <code>gc</code> +marked with <code>*.keep</code> file in the repository, <code>git</code> <code>gc</code> <code>--auto</code> consolidates them into one larger pack. The default value is 50. Setting this to 0 disables it. Setting <code>gc.auto</code> to 0 will also disable this.</p> @@ -6211,8 +6211,8 @@ <li> <p>Host/domain name (e.g., <code>example.com</code> in <code>https://example.com/</code>). This field must match between the config key and the URL. It is -possible to specify a * as part of the host name to match all subdomains -at this level. <code>https://</code>*.<code>example.com/</code> for example would match +possible to specify a <code>*</code> as part of the host name to match all subdomains +at this level. <code>https://*.example.com/</code> for example would match <code>https://foo.example.com/</code>, but not <code>https://foo.bar.example.com/</code>.</p> </li> <li> @@ -7294,13 +7294,13 @@ and this config option is ignored whenever the corresponding pack is larger than 2 GB.</p> <div class="paragraph"> -<p>If you have an old Git that does not understand the version 2 *.<code>idx</code> file, +<p>If you have an old Git that does not understand the version 2 <code>*.idx</code> file, cloning or fetching over a non-native protocol (e.g. "http") -that will copy both *.<code>pack</code> file and corresponding *.<code>idx</code> file from the +that will copy both <code>*.pack</code> file and corresponding <code>*.idx</code> file from the other side may give you a repository that cannot be accessed with your -older version of Git. If the *.<code>pack</code> file is smaller than 2 GB, however, +older version of Git. If the <code>*.pack</code> file is smaller than 2 GB, however, you can use <a href="git-index-pack.html">git-index-pack(1)</a> on the *.pack file to regenerate -the *.<code>idx</code> file.</p> +the <code>*.idx</code> file.</p> </div> </dd> <dt class="hdlist1">pack.packSizeLimit</dt> @@ -8316,7 +8316,7 @@ <dd> <p>Parameters used by <a href="git-pack-objects.html">git-pack-objects(1)</a> when generating a cruft pack and the respective parameters are not given over -the command line. See similarly named <code>pack.</code>* configuration +the command line. See similarly named <code>pack.*</code> configuration variables for defaults and meaning.</p> </dd> <dt class="hdlist1">rerere.autoUpdate</dt> @@ -8395,11 +8395,11 @@ </div> <div class="paragraph"> <p>To completely opt-out of this security check, set <code>safe.directory</code> to the -string *. This will allow all repositories to be treated as if their -directory was listed in the <code>safe.directory</code> list. If <code>safe.directory=</code>* +string <code>*</code>. This will allow all repositories to be treated as if their +directory was listed in the <code>safe.directory</code> list. If <code>safe.directory=*</code> is set in system config and you want to re-enable this protection, then initialize your list with an empty value before listing the repositories -that you deem safe. Giving a directory with <code>/</code>* appended to it will +that you deem safe. Giving a directory with <code>/*</code> appended to it will allow access to all repositories under the named directory.</p> </div> <div class="paragraph"> @@ -9055,7 +9055,7 @@ <dd> <p>A comma-separated list of patterns of "important" config settings that should be recorded in the trace2 output. -For example, <code>core.</code>*,remote.*.<code>url</code> would cause the trace2 +For example, <code>core.*,remote.*.url</code> would cause the trace2 output to contain events listing each configured remote. May be overridden by the <code>GIT_TRACE2_CONFIG_PARAMS</code> environment variable. Unset by default.</p> @@ -9538,7 +9538,7 @@ <div class="paragraph"> <p>Note that any protocol restrictions will be applied to the rewritten URL. If the rewrite changes the URL to use a custom protocol or remote -helper, you may need to adjust the <code>protocol.</code>*.<code>allow</code> config to permit +helper, you may need to adjust the <code>protocol.*.allow</code> config to permit the request. In particular, protocols you expect to use for submodules must be set to <code>always</code> rather than the default of <code>user</code>. See the description of <code>protocol.allow</code> above.</p> diff --git a/git-credential.html b/git-credential.html index d09a7b7..38f284e 100644 --- a/git-credential.html +++ b/git-credential.html
@@ -600,7 +600,7 @@ <p>Attributes with keys that end with C-style array brackets [] can have multiple values. Each instance of a multi-valued attribute forms an ordered list of values - the order of the repeated attributes defines -the order of the values. An empty multi-valued attribute (<code>key</code>[]<code>=</code>\n) +the order of the values. An empty multi-valued attribute (<code>key</code>[]<code>=\n</code>) acts to clear any previous entries and reset the list.</p> </div> <div class="paragraph">
diff --git a/git-diff-files.html b/git-diff-files.html index 274a94b..7a0303a 100644 --- a/git-diff-files.html +++ b/git-diff-files.html
@@ -600,7 +600,7 @@ while setting <code>diff.statNameWidth</code> or <code>diff.statGraphWidth</code> does not affect <code>git</code> <code>format-patch</code>. By giving a third parameter <em><count></em>, you can limit the output to -the first <em><count></em> lines, followed by ... if there are more.</p> +the first <em><count></em> lines, followed by <code>...</code> if there are more.</p> <div class="paragraph"> <p>These parameters can also be set individually with <code>--stat-width=</code><em><width></em>, <code>--stat-name-width=</code><em><name-width></em> and <code>--stat-count=</code><em><count></em>.</p> @@ -658,7 +658,7 @@ natural concept of lines). This is a more expensive <code>--dirstat</code> behavior than the <code>changes</code> behavior, but it does count rearranged lines within a file as much as other changes. The resulting output -is consistent with what you get from the other <code>--</code>*stat options.</p> +is consistent with what you get from the other <code>--*stat</code> options.</p> </dd> <dt class="hdlist1"><code>files</code></dt> <dd> @@ -1070,7 +1070,7 @@ exceeds the specified number. Defaults to <code>diff.renameLimit</code>. Note that a value of 0 is treated as unlimited.</p> </dd> -<dt class="hdlist1"><code>--diff-filter=</code>[(<code>A</code>|<code>C</code>|<code>D</code>|<code>M</code>|<code>R</code>|<code>T</code>|<code>U</code>|<code>X</code>|<code>B</code>)<code>...</code>[*]]</dt> +<dt class="hdlist1"><code>--diff-filter=</code>[(<code>A</code>|<code>C</code>|<code>D</code>|<code>M</code>|<code>R</code>|<code>T</code>|<code>U</code>|<code>X</code>|<code>B</code>)<code>...</code>[<code>*</code>]]</dt> <dd> <p>Select only files that are Added (<code>A</code>), Copied (<code>C</code>), Deleted (<code>D</code>), Modified (<code>M</code>), Renamed (<code>R</code>), have their @@ -1078,7 +1078,7 @@ are Unmerged (<code>U</code>), are Unknown (<code>X</code>), or have had their pairing Broken (<code>B</code>). Any combination of the filter characters (including none) can be used. -When * (All-or-none) is added to the combination, all +When <code>*</code> (All-or-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected.</p> @@ -1191,7 +1191,7 @@ </li> <li> <p>Lines starting with a hash ("#") are ignored, so they can be used -for comments. Add a backslash ("\") to the beginning of the +for comments. Add a backslash ("<code>\</code>") to the beginning of the pattern if it starts with a hash.</p> </li> <li> @@ -1205,7 +1205,7 @@ <p>Patterns have the same syntax and semantics as patterns used for <code>fnmatch</code>(3) without the <code>FNM_PATHNAME</code> flag, except a pathname also matches a pattern if removing any number of the final pathname -components matches the pattern. For example, the pattern "<code>foo</code>*bar" +components matches the pattern. For example, the pattern "<code>foo*bar</code>" matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<code>foobarx</code>".</p> </div> </dd> @@ -1679,7 +1679,7 @@ <code>rename</code> <code>to</code> <em><path></em> <code>similarity</code> <code>index</code> <em><number></em> <code>dissimilarity</code> <code>index</code> <em><number></em> -<code>index</code> <em><hash></em>`..`<em><hash></em> <em><mode></em></pre> +<code>index</code> <em><hash></em><code>..</code><em><hash></em> <em><mode></em></pre> </div> <div class="paragraph"> <p>File modes <em><mode></em> are printed as 6-digit octal numbers including the file type @@ -1801,9 +1801,9 @@ <p>It is followed by one or more extended header lines (this example shows a merge with two parents):</p> <div class="verseblock"> -<pre class="content"><code>index</code> <em><hash></em><code>,</code><em><hash></em>`..<code>__</code><em><hash></em><code>__</code> -{empty}`mode <em><mode></em><code>,</code><em><mode></em>``..``<em><mode></em> -<code>new</code> <code>file</code> <code>mode</code> <em><mode></em> +<pre class="content"><code>index</code> <em><hash></em><code>,</code><em><hash></em><code>..</code><em><hash></em> +<code>mode</code> <em><mode></em><code>,</code><em><mode></em>`<code>..</code><code>__</code><em><mode></em><code>__</code> +{empty}`new <code>file</code> <code>mode</code> <em><mode></em> <code>deleted</code> <code>file</code> <code>mode</code> <em><mode></em><code>,</code><em><mode></em></pre> </div> <div class="paragraph"> diff --git a/git-diff-index.html b/git-diff-index.html index 3b53cc7..a5e5165 100644 --- a/git-diff-index.html +++ b/git-diff-index.html
@@ -601,7 +601,7 @@ while setting <code>diff.statNameWidth</code> or <code>diff.statGraphWidth</code> does not affect <code>git</code> <code>format-patch</code>. By giving a third parameter <em><count></em>, you can limit the output to -the first <em><count></em> lines, followed by ... if there are more.</p> +the first <em><count></em> lines, followed by <code>...</code> if there are more.</p> <div class="paragraph"> <p>These parameters can also be set individually with <code>--stat-width=</code><em><width></em>, <code>--stat-name-width=</code><em><name-width></em> and <code>--stat-count=</code><em><count></em>.</p> @@ -659,7 +659,7 @@ natural concept of lines). This is a more expensive <code>--dirstat</code> behavior than the <code>changes</code> behavior, but it does count rearranged lines within a file as much as other changes. The resulting output -is consistent with what you get from the other <code>--</code>*stat options.</p> +is consistent with what you get from the other <code>--*stat</code> options.</p> </dd> <dt class="hdlist1"><code>files</code></dt> <dd> @@ -1071,7 +1071,7 @@ exceeds the specified number. Defaults to <code>diff.renameLimit</code>. Note that a value of 0 is treated as unlimited.</p> </dd> -<dt class="hdlist1"><code>--diff-filter=</code>[(<code>A</code>|<code>C</code>|<code>D</code>|<code>M</code>|<code>R</code>|<code>T</code>|<code>U</code>|<code>X</code>|<code>B</code>)<code>...</code>[*]]</dt> +<dt class="hdlist1"><code>--diff-filter=</code>[(<code>A</code>|<code>C</code>|<code>D</code>|<code>M</code>|<code>R</code>|<code>T</code>|<code>U</code>|<code>X</code>|<code>B</code>)<code>...</code>[<code>*</code>]]</dt> <dd> <p>Select only files that are Added (<code>A</code>), Copied (<code>C</code>), Deleted (<code>D</code>), Modified (<code>M</code>), Renamed (<code>R</code>), have their @@ -1079,7 +1079,7 @@ are Unmerged (<code>U</code>), are Unknown (<code>X</code>), or have had their pairing Broken (<code>B</code>). Any combination of the filter characters (including none) can be used. -When * (All-or-none) is added to the combination, all +When <code>*</code> (All-or-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected.</p> @@ -1192,7 +1192,7 @@ </li> <li> <p>Lines starting with a hash ("#") are ignored, so they can be used -for comments. Add a backslash ("\") to the beginning of the +for comments. Add a backslash ("<code>\</code>") to the beginning of the pattern if it starts with a hash.</p> </li> <li> @@ -1206,7 +1206,7 @@ <p>Patterns have the same syntax and semantics as patterns used for <code>fnmatch</code>(3) without the <code>FNM_PATHNAME</code> flag, except a pathname also matches a pattern if removing any number of the final pathname -components matches the pattern. For example, the pattern "<code>foo</code>*bar" +components matches the pattern. For example, the pattern "<code>foo*bar</code>" matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<code>foobarx</code>".</p> </div> </dd> @@ -1675,7 +1675,7 @@ <code>rename</code> <code>to</code> <em><path></em> <code>similarity</code> <code>index</code> <em><number></em> <code>dissimilarity</code> <code>index</code> <em><number></em> -<code>index</code> <em><hash></em>`..`<em><hash></em> <em><mode></em></pre> +<code>index</code> <em><hash></em><code>..</code><em><hash></em> <em><mode></em></pre> </div> <div class="paragraph"> <p>File modes <em><mode></em> are printed as 6-digit octal numbers including the file type @@ -1797,9 +1797,9 @@ <p>It is followed by one or more extended header lines (this example shows a merge with two parents):</p> <div class="verseblock"> -<pre class="content"><code>index</code> <em><hash></em><code>,</code><em><hash></em>`..<code>__</code><em><hash></em><code>__</code> -{empty}`mode <em><mode></em><code>,</code><em><mode></em>``..``<em><mode></em> -<code>new</code> <code>file</code> <code>mode</code> <em><mode></em> +<pre class="content"><code>index</code> <em><hash></em><code>,</code><em><hash></em><code>..</code><em><hash></em> +<code>mode</code> <em><mode></em><code>,</code><em><mode></em>`<code>..</code><code>__</code><em><mode></em><code>__</code> +{empty}`new <code>file</code> <code>mode</code> <em><mode></em> <code>deleted</code> <code>file</code> <code>mode</code> <em><mode></em><code>,</code><em><mode></em></pre> </div> <div class="paragraph"> diff --git a/git-diff-pairs.html b/git-diff-pairs.html index 7e58610..d3c92d7 100644 --- a/git-diff-pairs.html +++ b/git-diff-pairs.html
@@ -639,7 +639,7 @@ while setting <code>diff.statNameWidth</code> or <code>diff.statGraphWidth</code> does not affect <code>git</code> <code>format-patch</code>. By giving a third parameter <em><count></em>, you can limit the output to -the first <em><count></em> lines, followed by ... if there are more.</p> +the first <em><count></em> lines, followed by <code>...</code> if there are more.</p> <div class="paragraph"> <p>These parameters can also be set individually with <code>--stat-width=</code><em><width></em>, <code>--stat-name-width=</code><em><name-width></em> and <code>--stat-count=</code><em><count></em>.</p> @@ -697,7 +697,7 @@ natural concept of lines). This is a more expensive <code>--dirstat</code> behavior than the <code>changes</code> behavior, but it does count rearranged lines within a file as much as other changes. The resulting output -is consistent with what you get from the other <code>--</code>*stat options.</p> +is consistent with what you get from the other <code>--*stat</code> options.</p> </dd> <dt class="hdlist1"><code>files</code></dt> <dd> @@ -1109,7 +1109,7 @@ exceeds the specified number. Defaults to <code>diff.renameLimit</code>. Note that a value of 0 is treated as unlimited.</p> </dd> -<dt class="hdlist1"><code>--diff-filter=</code>[(<code>A</code>|<code>C</code>|<code>D</code>|<code>M</code>|<code>R</code>|<code>T</code>|<code>U</code>|<code>X</code>|<code>B</code>)<code>...</code>[*]]</dt> +<dt class="hdlist1"><code>--diff-filter=</code>[(<code>A</code>|<code>C</code>|<code>D</code>|<code>M</code>|<code>R</code>|<code>T</code>|<code>U</code>|<code>X</code>|<code>B</code>)<code>...</code>[<code>*</code>]]</dt> <dd> <p>Select only files that are Added (<code>A</code>), Copied (<code>C</code>), Deleted (<code>D</code>), Modified (<code>M</code>), Renamed (<code>R</code>), have their @@ -1117,7 +1117,7 @@ are Unmerged (<code>U</code>), are Unknown (<code>X</code>), or have had their pairing Broken (<code>B</code>). Any combination of the filter characters (including none) can be used. -When * (All-or-none) is added to the combination, all +When <code>*</code> (All-or-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected.</p> @@ -1230,7 +1230,7 @@ </li> <li> <p>Lines starting with a hash ("#") are ignored, so they can be used -for comments. Add a backslash ("\") to the beginning of the +for comments. Add a backslash ("<code>\</code>") to the beginning of the pattern if it starts with a hash.</p> </li> <li> @@ -1244,7 +1244,7 @@ <p>Patterns have the same syntax and semantics as patterns used for <code>fnmatch</code>(3) without the <code>FNM_PATHNAME</code> flag, except a pathname also matches a pattern if removing any number of the final pathname -components matches the pattern. For example, the pattern "<code>foo</code>*bar" +components matches the pattern. For example, the pattern "<code>foo*bar</code>" matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<code>foobarx</code>".</p> </div> </dd> @@ -1469,7 +1469,7 @@ <code>rename</code> <code>to</code> <em><path></em> <code>similarity</code> <code>index</code> <em><number></em> <code>dissimilarity</code> <code>index</code> <em><number></em> -<code>index</code> <em><hash></em>`..`<em><hash></em> <em><mode></em></pre> +<code>index</code> <em><hash></em><code>..</code><em><hash></em> <em><mode></em></pre> </div> <div class="paragraph"> <p>File modes <em><mode></em> are printed as 6-digit octal numbers including the file type @@ -1591,9 +1591,9 @@ <p>It is followed by one or more extended header lines (this example shows a merge with two parents):</p> <div class="verseblock"> -<pre class="content"><code>index</code> <em><hash></em><code>,</code><em><hash></em>`..<code>__</code><em><hash></em><code>__</code> -{empty}`mode <em><mode></em><code>,</code><em><mode></em>``..``<em><mode></em> -<code>new</code> <code>file</code> <code>mode</code> <em><mode></em> +<pre class="content"><code>index</code> <em><hash></em><code>,</code><em><hash></em><code>..</code><em><hash></em> +<code>mode</code> <em><mode></em><code>,</code><em><mode></em>`<code>..</code><code>__</code><em><mode></em><code>__</code> +{empty}`new <code>file</code> <code>mode</code> <em><mode></em> <code>deleted</code> <code>file</code> <code>mode</code> <em><mode></em><code>,</code><em><mode></em></pre> </div> <div class="paragraph"> @@ -1698,7 +1698,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2025-03-26 16:41:02 +0900 +Last updated 2025-03-26 00:41:02 -0700 </div> </div> </body> diff --git a/git-diff-tree.html b/git-diff-tree.html index 4ba0f93..5dacd9c 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html
@@ -606,7 +606,7 @@ while setting <code>diff.statNameWidth</code> or <code>diff.statGraphWidth</code> does not affect <code>git</code> <code>format-patch</code>. By giving a third parameter <em><count></em>, you can limit the output to -the first <em><count></em> lines, followed by ... if there are more.</p> +the first <em><count></em> lines, followed by <code>...</code> if there are more.</p> <div class="paragraph"> <p>These parameters can also be set individually with <code>--stat-width=</code><em><width></em>, <code>--stat-name-width=</code><em><name-width></em> and <code>--stat-count=</code><em><count></em>.</p> @@ -664,7 +664,7 @@ natural concept of lines). This is a more expensive <code>--dirstat</code> behavior than the <code>changes</code> behavior, but it does count rearranged lines within a file as much as other changes. The resulting output -is consistent with what you get from the other <code>--</code>*stat options.</p> +is consistent with what you get from the other <code>--*stat</code> options.</p> </dd> <dt class="hdlist1"><code>files</code></dt> <dd> @@ -1076,7 +1076,7 @@ exceeds the specified number. Defaults to <code>diff.renameLimit</code>. Note that a value of 0 is treated as unlimited.</p> </dd> -<dt class="hdlist1"><code>--diff-filter=</code>[(<code>A</code>|<code>C</code>|<code>D</code>|<code>M</code>|<code>R</code>|<code>T</code>|<code>U</code>|<code>X</code>|<code>B</code>)<code>...</code>[*]]</dt> +<dt class="hdlist1"><code>--diff-filter=</code>[(<code>A</code>|<code>C</code>|<code>D</code>|<code>M</code>|<code>R</code>|<code>T</code>|<code>U</code>|<code>X</code>|<code>B</code>)<code>...</code>[<code>*</code>]]</dt> <dd> <p>Select only files that are Added (<code>A</code>), Copied (<code>C</code>), Deleted (<code>D</code>), Modified (<code>M</code>), Renamed (<code>R</code>), have their @@ -1084,7 +1084,7 @@ are Unmerged (<code>U</code>), are Unknown (<code>X</code>), or have had their pairing Broken (<code>B</code>). Any combination of the filter characters (including none) can be used. -When * (All-or-none) is added to the combination, all +When <code>*</code> (All-or-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected.</p> @@ -1197,7 +1197,7 @@ </li> <li> <p>Lines starting with a hash ("#") are ignored, so they can be used -for comments. Add a backslash ("\") to the beginning of the +for comments. Add a backslash ("<code>\</code>") to the beginning of the pattern if it starts with a hash.</p> </li> <li> @@ -1211,7 +1211,7 @@ <p>Patterns have the same syntax and semantics as patterns used for <code>fnmatch</code>(3) without the <code>FNM_PATHNAME</code> flag, except a pathname also matches a pattern if removing any number of the final pathname -components matches the pattern. For example, the pattern "<code>foo</code>*bar" +components matches the pattern. For example, the pattern "<code>foo*bar</code>" matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<code>foobarx</code>".</p> </div> </dd> @@ -2654,7 +2654,7 @@ <code>rename</code> <code>to</code> <em><path></em> <code>similarity</code> <code>index</code> <em><number></em> <code>dissimilarity</code> <code>index</code> <em><number></em> -<code>index</code> <em><hash></em>`..`<em><hash></em> <em><mode></em></pre> +<code>index</code> <em><hash></em><code>..</code><em><hash></em> <em><mode></em></pre> </div> <div class="paragraph"> <p>File modes <em><mode></em> are printed as 6-digit octal numbers including the file type @@ -2776,9 +2776,9 @@ <p>It is followed by one or more extended header lines (this example shows a merge with two parents):</p> <div class="verseblock"> -<pre class="content"><code>index</code> <em><hash></em><code>,</code><em><hash></em>`..<code>__</code><em><hash></em><code>__</code> -{empty}`mode <em><mode></em><code>,</code><em><mode></em>``..``<em><mode></em> -<code>new</code> <code>file</code> <code>mode</code> <em><mode></em> +<pre class="content"><code>index</code> <em><hash></em><code>,</code><em><hash></em><code>..</code><em><hash></em> +<code>mode</code> <em><mode></em><code>,</code><em><mode></em>`<code>..</code><code>__</code><em><mode></em><code>__</code> +{empty}`new <code>file</code> <code>mode</code> <em><mode></em> <code>deleted</code> <code>file</code> <code>mode</code> <em><mode></em><code>,</code><em><mode></em></pre> </div> <div class="paragraph"> diff --git a/git-diff.html b/git-diff.html index 017de62..0dab7be 100644 --- a/git-diff.html +++ b/git-diff.html
@@ -455,8 +455,8 @@ <pre class="content"><code>git</code> <code>diff</code> [<em><options></em>] [<em><commit></em>] [<code>--</code>] [<em><path></em>…​] <code>git</code> <code>diff</code> [<em><options></em>] <code>--cached</code> [<code>--merge-base</code>] [<em><commit></em>] [<code>--</code>] [<em><path></em>…​] <code>git</code> <code>diff</code> [<em><options></em>] [<code>--merge-base</code>] <em><commit></em> [<em><commit></em>…​] <em><commit></em> [<code>--</code>] [<em><path></em>…​] -<code>git</code> <code>diff</code> [<em><options></em>] <em><commit></em>`…​<code>__</code><em><commit></em><code>__</code> [{empty}--{empty}]{empty} [<code>__</code><em><path></em><code>__..</code>.]{empty} -{empty}`git <code>diff</code> [<em><options></em>] <em><blob></em> <em><blob></em> +<code>git</code> <code>diff</code> [<em><options></em>] <em><commit></em><code>...</code><em><commit></em> [<code>--</code>] [<em><path></em>…​] +<code>git</code> <code>diff</code> [<em><options></em>] <em><blob></em> <em><blob></em> <code>git</code> <code>diff</code> [<em><options></em>] <code>--no-index</code> [<code>--</code>] <em><path></em> <em><path></em></pre> </div> </div> @@ -538,7 +538,7 @@ </dd> <dt class="hdlist1"><code>git</code> <code>diff</code> [<em><options></em>] <em><commit></em><code>..</code><em><commit></em> [<code>--</code>] [<em><path></em>...]</dt> <dd> -<p>This is synonymous to the earlier form (without the ..) for +<p>This is synonymous to the earlier form (without the <code>..</code>) for viewing the changes between two arbitrary <em><commit></em>. If <em><commit></em> on one side is omitted, it will have the same effect as using <code>HEAD</code> instead.</p> @@ -556,7 +556,7 @@ <div class="paragraph"> <p>Just in case you are doing something exotic, it should be noted that all of the <em><commit></em> in the above description, except -in the <code>--merge-base</code> case and in the last two forms that use .. +in the <code>--merge-base</code> case and in the last two forms that use <code>..</code> notations, can be any <em><tree></em>. A tree of interest is the one pointed to by the ref named <code>AUTO_MERGE</code>, which is written by the <code>ort</code> merge strategy upon hitting merge conflicts (see <a href="git-merge.html">git-merge(1)</a>). @@ -715,7 +715,7 @@ while setting <code>diff.statNameWidth</code> or <code>diff.statGraphWidth</code> does not affect <code>git</code> <code>format-patch</code>. By giving a third parameter <em><count></em>, you can limit the output to -the first <em><count></em> lines, followed by ... if there are more.</p> +the first <em><count></em> lines, followed by <code>...</code> if there are more.</p> <div class="paragraph"> <p>These parameters can also be set individually with <code>--stat-width=</code><em><width></em>, <code>--stat-name-width=</code><em><name-width></em> and <code>--stat-count=</code><em><count></em>.</p> @@ -773,7 +773,7 @@ natural concept of lines). This is a more expensive <code>--dirstat</code> behavior than the <code>changes</code> behavior, but it does count rearranged lines within a file as much as other changes. The resulting output -is consistent with what you get from the other <code>--</code>*stat options.</p> +is consistent with what you get from the other <code>--*stat</code> options.</p> </dd> <dt class="hdlist1"><code>files</code></dt> <dd> @@ -1190,7 +1190,7 @@ exceeds the specified number. Defaults to <code>diff.renameLimit</code>. Note that a value of 0 is treated as unlimited.</p> </dd> -<dt class="hdlist1"><code>--diff-filter=</code>[(<code>A</code>|<code>C</code>|<code>D</code>|<code>M</code>|<code>R</code>|<code>T</code>|<code>U</code>|<code>X</code>|<code>B</code>)<code>...</code>[*]]</dt> +<dt class="hdlist1"><code>--diff-filter=</code>[(<code>A</code>|<code>C</code>|<code>D</code>|<code>M</code>|<code>R</code>|<code>T</code>|<code>U</code>|<code>X</code>|<code>B</code>)<code>...</code>[<code>*</code>]]</dt> <dd> <p>Select only files that are Added (<code>A</code>), Copied (<code>C</code>), Deleted (<code>D</code>), Modified (<code>M</code>), Renamed (<code>R</code>), have their @@ -1198,7 +1198,7 @@ are Unmerged (<code>U</code>), are Unknown (<code>X</code>), or have had their pairing Broken (<code>B</code>). Any combination of the filter characters (including none) can be used. -When * (All-or-none) is added to the combination, all +When <code>*</code> (All-or-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected.</p> @@ -1311,7 +1311,7 @@ </li> <li> <p>Lines starting with a hash ("#") are ignored, so they can be used -for comments. Add a backslash ("\") to the beginning of the +for comments. Add a backslash ("<code>\</code>") to the beginning of the pattern if it starts with a hash.</p> </li> <li> @@ -1325,7 +1325,7 @@ <p>Patterns have the same syntax and semantics as patterns used for <code>fnmatch</code>(3) without the <code>FNM_PATHNAME</code> flag, except a pathname also matches a pattern if removing any number of the final pathname -components matches the pattern. For example, the pattern "<code>foo</code>*bar" +components matches the pattern. For example, the pattern "<code>foo*bar</code>" matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<code>foobarx</code>".</p> </div> </dd> @@ -1816,7 +1816,7 @@ <code>rename</code> <code>to</code> <em><path></em> <code>similarity</code> <code>index</code> <em><number></em> <code>dissimilarity</code> <code>index</code> <em><number></em> -<code>index</code> <em><hash></em>`..`<em><hash></em> <em><mode></em></pre> +<code>index</code> <em><hash></em><code>..</code><em><hash></em> <em><mode></em></pre> </div> <div class="paragraph"> <p>File modes <em><mode></em> are printed as 6-digit octal numbers including the file type @@ -1938,9 +1938,9 @@ <p>It is followed by one or more extended header lines (this example shows a merge with two parents):</p> <div class="verseblock"> -<pre class="content"><code>index</code> <em><hash></em><code>,</code><em><hash></em>`..<code>__</code><em><hash></em><code>__</code> -{empty}`mode <em><mode></em><code>,</code><em><mode></em>``..``<em><mode></em> -<code>new</code> <code>file</code> <code>mode</code> <em><mode></em> +<pre class="content"><code>index</code> <em><hash></em><code>,</code><em><hash></em><code>..</code><em><hash></em> +<code>mode</code> <em><mode></em><code>,</code><em><mode></em>`<code>..</code><code>__</code><em><mode></em><code>__</code> +{empty}`new <code>file</code> <code>mode</code> <em><mode></em> <code>deleted</code> <code>file</code> <code>mode</code> <em><mode></em><code>,</code><em><mode></em></pre> </div> <div class="paragraph"> @@ -2325,7 +2325,7 @@ natural concept of lines). This is a more expensive <code>--dirstat</code> behavior than the <code>changes</code> behavior, but it does count rearranged lines within a file as much as other changes. The resulting output -is consistent with what you get from the other <code>--</code>*stat options.</p> +is consistent with what you get from the other <code>--*stat</code> options.</p> </dd> <dt class="hdlist1"><code>files</code></dt> <dd> diff --git a/git-fast-import.html b/git-fast-import.html index 6dbaa69..8575321 100644 --- a/git-fast-import.html +++ b/git-fast-import.html
@@ -1281,12 +1281,12 @@ <p>When a <em><path></em> starts with a double quote ("), it is a C-style quoted string, where the complete filename is enclosed in a pair of double quotes and escape sequences are used. Certain characters must be escaped -by preceding them with a backslash: <code>LF</code> is written as \n, backslash -as \\, and double quote as \". Some characters may optionally be -written with escape sequences: \a for bell, \b for backspace, \f -for form feed, \n for line feed, \r for carriage return, \t for -horizontal tab, and \v for vertical tab. Any byte can be written with -3-digit octal codes (e.g., \033). All filenames can be represented as +by preceding them with a backslash: <code>LF</code> is written as <code>\n</code>, backslash +as <code>\\</code>, and double quote as <code>\</code>". Some characters may optionally be +written with escape sequences: <code>\a</code> for bell, <code>\b</code> for backspace, <code>\f</code> +for form feed, <code>\n</code> for line feed, <code>\r</code> for carriage return, <code>\t</code> for +horizontal tab, and <code>\v</code> for vertical tab. Any byte can be written with +3-digit octal codes (e.g., <code>\033</code>). All filenames can be represented as quoted strings.</p> </div> <div class="paragraph"> @@ -1305,7 +1305,7 @@ <p>start with a directory separator (e.g. <code>/foo</code> is invalid),</p> </li> <li> -<p>contain the special component . or .. (e.g. <code>foo/./bar</code> and +<p>contain the special component . or <code>..</code> (e.g. <code>foo/./bar</code> and <code>foo/</code><code>..</code><code>/bar</code> are invalid).</p> </li> </ul> @@ -1314,7 +1314,7 @@ <p>The root of the tree can be represented by an empty string as <em><path></em>.</p> </div> <div class="paragraph"> -<p><em><path></em> cannot contain NUL, either literally or escaped as \000. +<p><em><path></em> cannot contain NUL, either literally or escaped as <code>\000</code>. It is recommended that <em><path></em> always be encoded using UTF-8.</p> </div> </div> @@ -2559,7 +2559,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2025-03-29 17:09:47 +0900 +Last updated 2025-03-29 01:09:47 -0700 </div> </div> </body> diff --git a/git-fetch.html b/git-fetch.html index 8eab29b..4f3a064 100644 --- a/git-fetch.html +++ b/git-fetch.html
@@ -586,7 +586,7 @@ <dt class="hdlist1">--negotiate-only</dt> <dd> <p>Do not fetch anything from the server, and instead print the -ancestors of the provided <code>--negotiation-tip=</code>* arguments, +ancestors of the provided <code>--negotiation-tip=*</code> arguments, which we have in common with the server.</p> <div class="paragraph"> <p>This is incompatible with <code>--recurse-submodules=</code>[<code>yes</code>|<code>on-demand</code>]. @@ -703,7 +703,7 @@ <p>When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of -<code>remote.</code>*.<code>fetch</code> configuration variables for the remote +<code>remote.*.fetch</code> configuration variables for the remote repository. Providing an empty <em><refspec></em> to the <code>--refmap</code> option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as @@ -714,7 +714,7 @@ <dt class="hdlist1">--tags</dt> <dd> <p>Fetch all tags from the remote (i.e., fetch remote tags -<code>refs/tags/</code>* into local tags with the same name), in addition +<code>refs/tags/*</code> into local tags with the same name), in addition to whatever else would otherwise be fetched. Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the @@ -884,15 +884,15 @@ <code>+</code>, followed by the source <src>, followed by a colon <code>:</code>, followed by the destination <dst>. The colon can be omitted when <dst> is empty. <src> is -typically a ref, or a glob pattern with a single * that is used +typically a ref, or a glob pattern with a single <code>*</code> that is used to match a set of refs, but it can also be a fully spelled hex object name.</p> </div> <div class="paragraph"> -<p>A <refspec> may contain a * in its <src> to indicate a simple pattern +<p>A <refspec> may contain a <code>*</code> in its <src> to indicate a simple pattern match. Such a refspec functions like a glob that matches any ref with the -pattern. A pattern <refspec> must have one and only one * in both the <src> and -<dst>. It will map refs to the destination by replacing the * with the +pattern. A pattern <refspec> must have one and only one <code>*</code> in both the <src> and +<dst>. It will map refs to the destination by replacing the <code>*</code> with the contents matched from the source.</p> </div> <div class="paragraph"> @@ -925,10 +925,10 @@ </div> <div class="paragraph"> <p>Until Git version 2.20, and unlike when pushing with -<a href="git-push.html">git-push(1)</a>, any updates to <code>refs/tags/</code>* would be accepted +<a href="git-push.html">git-push(1)</a>, any updates to <code>refs/tags/*</code> would be accepted without <code>+</code> in the refspec (or <code>--force</code>). When fetching, we promiscuously considered all tag updates from a remote to be forced fetches. Since -Git version 2.20, fetching to update <code>refs/tags/</code>* works the same way +Git version 2.20, fetching to update <code>refs/tags/*</code> works the same way as when pushing. I.e. any updates will be rejected without <code>+</code> in the refspec (or <code>--force</code>).</p> </div> @@ -949,7 +949,7 @@ above about what’s not allowed as an update can be overridden by adding an optional leading <code>+</code> to a refspec (or using the <code>--force</code> command line option). The only exception to this is that no amount of -forcing will make the <code>refs/heads/</code>* namespace accept a non-commit +forcing will make the <code>refs/heads/*</code> namespace accept a non-commit object.</p> </div> <div class="admonitionblock note"> @@ -1288,8 +1288,8 @@ the refspecs—​they specify which refs to fetch and which local refs to update. The example above will fetch all branches that exist in the <code>origin</code> (i.e. any ref that matches -the left-hand side of the value, <code>refs/heads/</code>*) and update the -corresponding remote-tracking branches in the <code>refs/remotes/origin/</code>* +the left-hand side of the value, <code>refs/heads/*</code>) and update the +corresponding remote-tracking branches in the <code>refs/remotes/origin/*</code> hierarchy.</p> </li> <li> @@ -1361,7 +1361,7 @@ </div> <div class="paragraph"> <p>Therefore if the refspec for the remote includes -e.g. <code>refs/tags/</code>*:refs/tags/*, or you manually run e.g. <code>git</code> <code>fetch</code> +e.g. <code>refs/tags/*:refs/tags/*</code>, or you manually run e.g. <code>git</code> <code>fetch</code> <code>--prune</code> <em><name></em> "refs/tags/*:refs/tags/*" it won’t be stale remote tracking branches that are deleted, but any local tag that doesn’t exist on the remote.</p> @@ -1374,7 +1374,7 @@ </div> <div class="paragraph"> <p>So be careful when using this with a refspec like -<code>refs/tags/</code>*:refs/tags/*, or any other refspec which might map +<code>refs/tags/*:refs/tags/*</code>, or any other refspec which might map references from multiple remotes to the same local namespace.</p> </div> <div class="paragraph"> @@ -1387,7 +1387,7 @@ </div> <div class="paragraph"> <p>The <code>--prune-tags</code> option is equivalent to having -<code>refs/tags/</code>*:refs/tags/* declared in the refspecs of the remote. This +<code>refs/tags/*:refs/tags/*</code> declared in the refspecs of the remote. This can lead to some seemingly strange interactions:</p> </div> <div class="listingblock"> @@ -1459,8 +1459,8 @@ <div class="paragraph"> <p>In compact output mode, specified with configuration variable fetch.output, if either entire <em><from></em> or <em><to></em> is found in the -other string, it will be substituted with * in the other string. For -example, <code>master</code> <code>-</code>> <code>origin/master</code> becomes <code>master</code> <code>-</code>> <code>origin/</code>*.</p> +other string, it will be substituted with <code>*</code> in the other string. For +example, <code>master</code> <code>-</code>> <code>origin/master</code> becomes <code>master</code> <code>-</code>> <code>origin/*</code>.</p> </div> <div class="dlist"> <dl> @@ -1485,7 +1485,7 @@ <dd> <p>for a successful tag update;</p> </dd> -<dt class="hdlist1">*</dt> +<dt class="hdlist1"><code>*</code></dt> <dd> <p>for a successfully fetched new ref;</p> </dd> @@ -1690,7 +1690,7 @@ <dt class="hdlist1">fetch.pruneTags</dt> <dd> <p>If true, fetch will automatically behave as if the -<code>refs/tags/</code>*:refs/tags/* refspec was provided when pruning, +<code>refs/tags/*:refs/tags/*</code> refspec was provided when pruning, if not set already. This allows for setting both this option and <code>fetch.prune</code> to maintain a 1=1 mapping to upstream refs. See also <code>remote.</code><em><name></em><code>.pruneTags</code> and the PRUNING
diff --git a/git-filter-branch.html b/git-filter-branch.html index 02063f0..56f6ff0 100644 --- a/git-filter-branch.html +++ b/git-filter-branch.html
@@ -1017,7 +1017,7 @@ every commit as it existed in the original repo. If your repo has <code>10^5</code> files and <code>10^5</code> commits, but each commit only modifies five files, then git-filter-branch will make you do <code>10^10</code> modifications, -despite only having (at most) <code>5</code>*10^5 unique blobs.</p> +despite only having (at most) <code>5*10^5</code> unique blobs.</p> </li> <li> <p>If you try and cheat and try to make git-filter-branch only work on
diff --git a/git-for-each-ref.html b/git-for-each-ref.html index cf02943..0698fef 100644 --- a/git-for-each-ref.html +++ b/git-for-each-ref.html
@@ -512,7 +512,7 @@ the object it points at. In addition, the string literal %% renders as % and %xx - where <code>xx</code> are hex digits - renders as the character with hex code <code>xx</code>. For example, %00 interpolates to -\0 (NUL), %09 to \t (TAB), and %0a to \n (LF).</p> +<code>\0</code> (NUL), %09 to <code>\t</code> (TAB), and %0a to <code>\n</code> (LF).</p> <div class="paragraph"> <p>When unspecified, <em><format></em> defaults to %(<code>objectname</code>) <code>SPC</code> %(<code>objecttype</code>) <code>TAB</code> %(<code>refname</code>).</p> @@ -869,7 +869,7 @@ These are intended for working on a mix of annotated and lightweight tags.</p> </div> <div class="paragraph"> -<p>For tag objects, a <code>fieldname</code> prefixed with an asterisk (*) expands to +<p>For tag objects, a <code>fieldname</code> prefixed with an asterisk (<code>*</code>) expands to the <code>fieldname</code> value of the peeled object, rather than that of the tag object itself.</p> </div> @@ -1138,7 +1138,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2025-02-14 21:38:14 -0800 +Last updated 2025-03-26 00:41:02 -0700 </div> </div> </body>
diff --git a/git-format-patch.html b/git-format-patch.html index 6b74dcac..3396191 100644 --- a/git-format-patch.html +++ b/git-format-patch.html
@@ -686,7 +686,7 @@ while setting <code>diff.statNameWidth</code> or <code>diff.statGraphWidth</code> does not affect <code>git</code> <code>format-patch</code>. By giving a third parameter <em><count></em>, you can limit the output to -the first <em><count></em> lines, followed by ... if there are more.</p> +the first <em><count></em> lines, followed by <code>...</code> if there are more.</p> <div class="paragraph"> <p>These parameters can also be set individually with <code>--stat-width=</code><em><width></em>, <code>--stat-name-width=</code><em><name-width></em> and <code>--stat-count=</code><em><count></em>.</p> @@ -744,7 +744,7 @@ natural concept of lines). This is a more expensive <code>--dirstat</code> behavior than the <code>changes</code> behavior, but it does count rearranged lines within a file as much as other changes. The resulting output -is consistent with what you get from the other <code>--</code>*stat options.</p> +is consistent with what you get from the other <code>--*stat</code> options.</p> </dd> <dt class="hdlist1"><code>files</code></dt> <dd> @@ -938,7 +938,7 @@ </li> <li> <p>Lines starting with a hash ("#") are ignored, so they can be used -for comments. Add a backslash ("\") to the beginning of the +for comments. Add a backslash ("<code>\</code>") to the beginning of the pattern if it starts with a hash.</p> </li> <li> @@ -952,7 +952,7 @@ <p>Patterns have the same syntax and semantics as patterns used for <code>fnmatch</code>(3) without the <code>FNM_PATHNAME</code> flag, except a pathname also matches a pattern if removing any number of the final pathname -components matches the pattern. For example, the pattern "<code>foo</code>*bar" +components matches the pattern. For example, the pattern "<code>foo*bar</code>" matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<code>foobarx</code>".</p> </div> </dd> diff --git a/git-fsck.html b/git-fsck.html index 94aebd4..640ff82 100644 --- a/git-fsck.html +++ b/git-fsck.html
@@ -605,9 +605,9 @@ to clone or fetch it set <code>fetch.fsck.</code><em><msg-id></em>.</p> </div> <div class="paragraph"> -<p>The rest of the documentation discusses <code>fsck.</code>* for brevity, but the -same applies for the corresponding <code>receive.fsck.</code>* and -<code>fetch.fsck.</code>*. variables.</p> +<p>The rest of the documentation discusses <code>fsck.*</code> for brevity, but the +same applies for the corresponding <code>receive.fsck.*</code> and +<code>fetch.fsck.*</code>. variables.</p> </div> <div class="paragraph"> <p>Unlike variables like <code>color.ui</code> and <code>core.editor</code>, the @@ -910,7 +910,7 @@ </dd> <dt class="hdlist1"><code>hasDotdot</code></dt> <dd> -<p>(WARN) A tree contains an entry named ...</p> +<p>(WARN) A tree contains an entry named <code>..</code>.</p> </dd> <dt class="hdlist1"><code>hasDotgit</code></dt> <dd> @@ -1094,7 +1094,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2025-03-26 16:41:02 +0900 +Last updated 2025-03-26 00:41:02 -0700 </div> </div> </body>
diff --git a/git-fsmonitor--daemon.html b/git-fsmonitor--daemon.html index c3bdf74..0849e2a 100644 --- a/git-fsmonitor--daemon.html +++ b/git-fsmonitor--daemon.html
@@ -555,7 +555,7 @@ <div class="paragraph"> <p>By default, the socket is created in the .<code>git</code> directory. However, if the .<code>git</code> directory is on a network-mounted filesystem, it will instead be -created at <code>$HOME/.git-fsmonitor-</code>* unless <code>$HOME</code> itself is on a +created at <code>$HOME/.git-fsmonitor-*</code> unless <code>$HOME</code> itself is on a network-mounted filesystem, in which case you must set the configuration variable <code>fsmonitor.socketDir</code> to the path of a directory on a Mac OS native filesystem in which to create the socket file.</p>
diff --git a/git-gc.html b/git-gc.html index e9ef010..9c1c7d0 100644 --- a/git-gc.html +++ b/git-gc.html
@@ -651,7 +651,7 @@ <dt class="hdlist1">gc.autoPackLimit</dt> <dd> <p>When there are more than this many packs that are not -marked with *.<code>keep</code> file in the repository, <code>git</code> <code>gc</code> +marked with <code>*.keep</code> file in the repository, <code>git</code> <code>gc</code> <code>--auto</code> consolidates them into one larger pack. The default value is 50. Setting this to 0 disables it. Setting <code>gc.auto</code> to 0 will also disable this.</p>
diff --git a/git-grep.html b/git-grep.html index 6476a52..4688b1e 100644 --- a/git-grep.html +++ b/git-grep.html
@@ -838,7 +838,7 @@ <p>Looks for <code>time_t</code> in all tracked .c and .h files in the working directory and its subdirectories.</p> </dd> -<dt class="hdlist1"><code>git</code> <code>grep</code> <code>-e</code> '#define' <code>--and</code> \( <code>-e</code> <code>MAX_PATH</code> <code>-e</code> <code>PATH_MAX</code> \)</dt> +<dt class="hdlist1"><code>git</code> <code>grep</code> <code>-e</code> '#define' <code>--and</code> <code>\</code>( <code>-e</code> <code>MAX_PATH</code> <code>-e</code> <code>PATH_MAX</code> <code>\</code>)</dt> <dd> <p>Looks for a line that has #define and either <code>MAX_PATH</code> or <code>PATH_MAX</code>.</p>
diff --git a/git-help.html b/git-help.html index 3d816a5..0d1c176 100644 --- a/git-help.html +++ b/git-help.html
@@ -548,7 +548,7 @@ <div class="paragraph"> <p>This section of the documentation also covers general or widespread user-interface conventions (e.g. <a href="gitcli.html">gitcli(7)</a>), and -pseudo-configuration such as the file-based .<code>git/hooks/</code>* interface +pseudo-configuration such as the file-based .<code>git/hooks/*</code> interface described in <a href="githooks.html">githooks(5)</a>.</p> </div> </dd>
diff --git a/git-interpret-trailers.html b/git-interpret-trailers.html index 856d989..bbf5ba7 100644 --- a/git-interpret-trailers.html +++ b/git-interpret-trailers.html
@@ -487,7 +487,7 @@ options or configuration variables.</p> </div> <div class="paragraph"> -<p>Otherwise, this command applies <code>trailer.</code>* configuration variables +<p>Otherwise, this command applies <code>trailer.*</code> configuration variables (which could potentially add new trailers, as well as reposition them), as well as any command line arguments that can override configuration variables (such as <code>--trailer=..</code>. which could also add new trailers), @@ -642,7 +642,7 @@ <dt class="hdlist1">--only-input</dt> <dd> <p>Output only trailers that exist in the input; do not add any -from the command-line or by applying <code>trailer.</code>* configuration +from the command-line or by applying <code>trailer.*</code> configuration variables.</p> </dd> <dt class="hdlist1">--unfold</dt>
diff --git a/git-log.html b/git-log.html index 242da4b..ec1f6b2 100644 --- a/git-log.html +++ b/git-log.html
@@ -942,7 +942,7 @@ <dd> <p>Pretend as if the bad bisection ref <code>refs/bisect/bad</code> was listed and as if it was followed by <code>--not</code> and the good -bisection refs <code>refs/bisect/good-</code>* on the command +bisection refs <code>refs/bisect/good-*</code> on the command line.</p> </dd> <dt class="hdlist1">--stdin</dt> @@ -1890,7 +1890,7 @@ has no effect.</p> </div> <div class="paragraph"> -<p><code>--date=format:..</code>. feeds the format ... to your system <code>strftime</code>, +<p><code>--date=format:..</code>. feeds the format <code>...</code> to your system <code>strftime</code>, except for %s, %z, and %Z, which are handled internally. Use <code>--date=format:</code>%c to show the date in your system locale’s preferred format. See the <code>strftime</code> manual for a complete list of @@ -3001,7 +3001,7 @@ while setting <code>diff.statNameWidth</code> or <code>diff.statGraphWidth</code> does not affect <code>git</code> <code>format-patch</code>. By giving a third parameter <em><count></em>, you can limit the output to -the first <em><count></em> lines, followed by ... if there are more.</p> +the first <em><count></em> lines, followed by <code>...</code> if there are more.</p> <div class="paragraph"> <p>These parameters can also be set individually with <code>--stat-width=</code><em><width></em>, <code>--stat-name-width=</code><em><name-width></em> and <code>--stat-count=</code><em><count></em>.</p> @@ -3059,7 +3059,7 @@ natural concept of lines). This is a more expensive <code>--dirstat</code> behavior than the <code>changes</code> behavior, but it does count rearranged lines within a file as much as other changes. The resulting output -is consistent with what you get from the other <code>--</code>*stat options.</p> +is consistent with what you get from the other <code>--*stat</code> options.</p> </dd> <dt class="hdlist1"><code>files</code></dt> <dd> @@ -3476,7 +3476,7 @@ exceeds the specified number. Defaults to <code>diff.renameLimit</code>. Note that a value of 0 is treated as unlimited.</p> </dd> -<dt class="hdlist1"><code>--diff-filter=</code>[(<code>A</code>|<code>C</code>|<code>D</code>|<code>M</code>|<code>R</code>|<code>T</code>|<code>U</code>|<code>X</code>|<code>B</code>)<code>...</code>[*]]</dt> +<dt class="hdlist1"><code>--diff-filter=</code>[(<code>A</code>|<code>C</code>|<code>D</code>|<code>M</code>|<code>R</code>|<code>T</code>|<code>U</code>|<code>X</code>|<code>B</code>)<code>...</code>[<code>*</code>]]</dt> <dd> <p>Select only files that are Added (<code>A</code>), Copied (<code>C</code>), Deleted (<code>D</code>), Modified (<code>M</code>), Renamed (<code>R</code>), have their @@ -3484,7 +3484,7 @@ are Unmerged (<code>U</code>), are Unknown (<code>X</code>), or have had their pairing Broken (<code>B</code>). Any combination of the filter characters (including none) can be used. -When * (All-or-none) is added to the combination, all +When <code>*</code> (All-or-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected.</p> @@ -3597,7 +3597,7 @@ </li> <li> <p>Lines starting with a hash ("#") are ignored, so they can be used -for comments. Add a backslash ("\") to the beginning of the +for comments. Add a backslash ("<code>\</code>") to the beginning of the pattern if it starts with a hash.</p> </li> <li> @@ -3611,7 +3611,7 @@ <p>Patterns have the same syntax and semantics as patterns used for <code>fnmatch</code>(3) without the <code>FNM_PATHNAME</code> flag, except a pathname also matches a pattern if removing any number of the final pathname -components matches the pattern. For example, the pattern "<code>foo</code>*bar" +components matches the pattern. For example, the pattern "<code>foo*bar</code>" matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<code>foobarx</code>".</p> </div> </dd> @@ -3821,7 +3821,7 @@ <code>rename</code> <code>to</code> <em><path></em> <code>similarity</code> <code>index</code> <em><number></em> <code>dissimilarity</code> <code>index</code> <em><number></em> -<code>index</code> <em><hash></em>`..`<em><hash></em> <em><mode></em></pre> +<code>index</code> <em><hash></em><code>..</code><em><hash></em> <em><mode></em></pre> </div> <div class="paragraph"> <p>File modes <em><mode></em> are printed as 6-digit octal numbers including the file type @@ -3943,9 +3943,9 @@ <p>It is followed by one or more extended header lines (this example shows a merge with two parents):</p> <div class="verseblock"> -<pre class="content"><code>index</code> <em><hash></em><code>,</code><em><hash></em>`..<code>__</code><em><hash></em><code>__</code> -{empty}`mode <em><mode></em><code>,</code><em><mode></em>``..``<em><mode></em> -<code>new</code> <code>file</code> <code>mode</code> <em><mode></em> +<pre class="content"><code>index</code> <em><hash></em><code>,</code><em><hash></em><code>..</code><em><hash></em> +<code>mode</code> <em><mode></em><code>,</code><em><mode></em>`<code>..</code><code>__</code><em><mode></em><code>__</code> +{empty}`new <code>file</code> <code>mode</code> <em><mode></em> <code>deleted</code> <code>file</code> <code>mode</code> <em><mode></em><code>,</code><em><mode></em></pre> </div> <div class="paragraph"> @@ -4077,7 +4077,7 @@ any of remote-tracking branches for <em>origin</em> (what you have that origin doesn’t).</p> </dd> -<dt class="hdlist1"><code>git</code> <code>log</code> <code>master</code> <code>--not</code> <code>--remotes=</code>*/master</dt> +<dt class="hdlist1"><code>git</code> <code>log</code> <code>master</code> <code>--not</code> <code>--remotes=*/master</code></dt> <dd> <p>Shows all commits that are in local master but not in any remote repository master branches.</p> @@ -4405,7 +4405,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2025-02-15 14:38:14 +0900 +Last updated 2025-02-14 21:38:14 -0800 </div> </div> </body> diff --git a/git-ls-files.html b/git-ls-files.html index a88d93d..bded97b 100644 --- a/git-ls-files.html +++ b/git-ls-files.html
@@ -520,7 +520,7 @@ matching an exclude pattern. When showing "other" files (i.e. when used with <em>-o</em>), show only those matched by an exclude pattern. Standard ignore rules are not automatically -activated; therefore, at least one of the <code>--exclude</code>* options +activated; therefore, at least one of the <code>--exclude*</code> options is required.</p> </dd> <dt class="hdlist1">-s</dt> @@ -736,7 +736,7 @@ <p>A string that interpolates %(<code>fieldname</code>) from the result being shown. It also interpolates %% to %, and %xXX where <code>XX</code> are hex digits interpolates to character with hex code <code>XX</code>; for example %x00 -interpolates to \0 (NUL), %x09 to \t (TAB) and %x0a to \n (LF). +interpolates to <code>\0</code> (NUL), %x09 to <code>\t</code> (TAB) and %x0a to <code>\n</code> (LF). --format cannot be combined with <code>-s</code>, <code>-o</code>, <code>-k</code>, <code>-t</code>, <code>--resolve-undo</code> and <code>--eol</code>.</p> </dd>
diff --git a/git-ls-tree.html b/git-ls-tree.html index dae67b8..6595b7e 100644 --- a/git-ls-tree.html +++ b/git-ls-tree.html
@@ -558,7 +558,7 @@ being shown. It also interpolates %% to %, and %xNN where <code>NN</code> are hex digits interpolates to character with hex code <code>NN</code>; for example %x00 interpolates to -\0 (NUL), %x09 to \t (TAB) and %x0a to \n (LF). +<code>\0</code> (NUL), %x09 to <code>\t</code> (TAB) and %x0a to <code>\n</code> (LF). When specified, <code>--format</code> cannot be combined with other format-altering options, including <code>--long</code>, <code>--name-only</code> and <code>--object-only</code>.</p>
diff --git a/git-mailsplit.html b/git-mailsplit.html index aee2923..2fa82e8 100644 --- a/git-mailsplit.html +++ b/git-mailsplit.html
@@ -516,7 +516,7 @@ </dd> <dt class="hdlist1">--keep-cr</dt> <dd> -<p>Do not remove \r from lines ending with \r\n.</p> +<p>Do not remove <code>\r</code> from lines ending with <code>\r\n</code>.</p> </dd> <dt class="hdlist1">--mboxrd</dt> <dd>
diff --git a/git-mergetool.html b/git-mergetool.html index 2999d03..650cfe6 100644 --- a/git-mergetool.html +++ b/git-mergetool.html
@@ -697,7 +697,7 @@ <h2 id="_temporary_files">TEMPORARY FILES</h2> <div class="sectionbody"> <div class="paragraph"> -<p><code>git</code> <code>mergetool</code> creates *.<code>orig</code> backup files while resolving merges. +<p><code>git</code> <code>mergetool</code> creates <code>*.orig</code> backup files while resolving merges. These are safe to remove once a file has been merged and its <code>git</code> <code>mergetool</code> session has completed.</p> </div>
diff --git a/git-mv.adoc b/git-mv.adoc index dc1bf61..f707e99 100644 --- a/git-mv.adoc +++ b/git-mv.adoc
@@ -8,19 +8,18 @@ SYNOPSIS -------- -[verse] -'git mv' [<options>] <source>... <destination> + +[synopsis] +git mv [-v] [-f] [-n] [-k] <source> <destination> +git mv [-v] [-f] [-n] [-k] <source>... <destination-directory> DESCRIPTION ----------- Move or rename a file, directory, or symlink. - git mv [-v] [-f] [-n] [-k] <source> <destination> - git mv [-v] [-f] [-n] [-k] <source> ... <destination-directory> - -In the first form, it renames <source>, which must exist and be either -a file, symlink or directory, to <destination>. -In the second form, the last argument has to be an existing +In the first form, it renames _<source>_, which must exist and be either +a file, symlink or directory, to _<destination>_. +In the second form, _<destination-directory>_ has to be an existing directory; the given sources will be moved into this directory. The index is updated after successful completion, but the change must still be @@ -28,20 +27,20 @@ OPTIONS ------- --f:: ---force:: +`-f`:: +`--force`:: Force renaming or moving of a file even if the <destination> exists. --k:: +`-k`:: Skip move or rename actions which would lead to an error condition. An error happens when a source is neither existing nor controlled by Git, or when it would overwrite an existing file unless `-f` is given. --n:: ---dry-run:: +`-n`:: +`--dry-run`:: Do nothing; only show what would happen --v:: ---verbose:: +`-v`:: +`--verbose`:: Report the names of files as they are moved. SUBMODULES @@ -49,8 +48,8 @@ Moving a submodule using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will update the gitfile and core.worktree setting to make the submodule work in the new location. -It also will attempt to update the submodule.<name>.path setting in -the linkgit:gitmodules[5] file and stage that file (unless -n is used). +It also will attempt to update the `submodule.<name>.path` setting in +the linkgit:gitmodules[5] file and stage that file (unless `-n` is used). BUGS ----
diff --git a/git-mv.html b/git-mv.html index 326caf7..ac7b5c5 100644 --- a/git-mv.html +++ b/git-mv.html
@@ -452,7 +452,8 @@ <h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<pre class="content"><em>git mv</em> [<options>] <source>…​ <destination></pre> +<pre class="content"><code>git</code> <code>mv</code> [<code>-v</code>] [<code>-f</code>] [<code>-n</code>] [<code>-k</code>] <em><source></em> <em><destination></em> +<code>git</code> <code>mv</code> [<code>-v</code>] [<code>-f</code>] [<code>-n</code>] [<code>-k</code>] <em><source></em>…​ <em><destination-directory></em></pre> </div> </div> </div> @@ -462,16 +463,10 @@ <div class="paragraph"> <p>Move or rename a file, directory, or symlink.</p> </div> -<div class="literalblock"> -<div class="content"> -<pre>git mv [-v] [-f] [-n] [-k] <source> <destination> -git mv [-v] [-f] [-n] [-k] <source> ... <destination-directory></pre> -</div> -</div> <div class="paragraph"> -<p>In the first form, it renames <source>, which must exist and be either -a file, symlink or directory, to <destination>. -In the second form, the last argument has to be an existing +<p>In the first form, it renames <em><source></em>, which must exist and be either +a file, symlink or directory, to <em><destination></em>. +In the second form, <em><destination-directory></em> has to be an existing directory; the given sources will be moved into this directory.</p> </div> <div class="paragraph"> @@ -485,25 +480,25 @@ <div class="sectionbody"> <div class="dlist"> <dl> -<dt class="hdlist1">-f</dt> -<dt class="hdlist1">--force</dt> +<dt class="hdlist1"><code>-f</code></dt> +<dt class="hdlist1"><code>--force</code></dt> <dd> <p>Force renaming or moving of a file even if the <destination> exists.</p> </dd> -<dt class="hdlist1">-k</dt> +<dt class="hdlist1"><code>-k</code></dt> <dd> <p>Skip move or rename actions which would lead to an error condition. An error happens when a source is neither existing nor controlled by Git, or when it would overwrite an existing file unless <code>-f</code> is given.</p> </dd> -<dt class="hdlist1">-n</dt> -<dt class="hdlist1">--dry-run</dt> +<dt class="hdlist1"><code>-n</code></dt> +<dt class="hdlist1"><code>--dry-run</code></dt> <dd> <p>Do nothing; only show what would happen</p> </dd> -<dt class="hdlist1">-v</dt> -<dt class="hdlist1">--verbose</dt> +<dt class="hdlist1"><code>-v</code></dt> +<dt class="hdlist1"><code>--verbose</code></dt> <dd> <p>Report the names of files as they are moved.</p> </dd> @@ -518,8 +513,8 @@ <p>Moving a submodule using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will update the gitfile and core.worktree setting to make the submodule work in the new location. -It also will attempt to update the submodule.<name>.path setting in -the <a href="gitmodules.html">gitmodules(5)</a> file and stage that file (unless -n is used).</p> +It also will attempt to update the <code>submodule.</code><em><name></em><code>.path</code> setting in +the <a href="gitmodules.html">gitmodules(5)</a> file and stage that file (unless <code>-n</code> is used).</p> </div> </div> </div> @@ -550,7 +545,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2025-02-14 21:38:14 -0800 +Last updated 2025-04-23 15:22:37 -0700 </div> </div> </body>
diff --git a/git-pull.html b/git-pull.html index fc1386d..fb3f7ff 100644 --- a/git-pull.html +++ b/git-pull.html
@@ -908,7 +908,7 @@ <dt class="hdlist1">--negotiate-only</dt> <dd> <p>Do not fetch anything from the server, and instead print the -ancestors of the provided <code>--negotiation-tip=</code>* arguments, +ancestors of the provided <code>--negotiation-tip=*</code> arguments, which we have in common with the server.</p> <div class="paragraph"> <p>This is incompatible with <code>--recurse-submodules=</code>[<code>yes</code>|<code>on-demand</code>]. @@ -975,7 +975,7 @@ <p>When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of -<code>remote.</code>*.<code>fetch</code> configuration variables for the remote +<code>remote.*.fetch</code> configuration variables for the remote repository. Providing an empty <em><refspec></em> to the <code>--refmap</code> option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as @@ -986,7 +986,7 @@ <dt class="hdlist1">--tags</dt> <dd> <p>Fetch all tags from the remote (i.e., fetch remote tags -<code>refs/tags/</code>* into local tags with the same name), in addition +<code>refs/tags/*</code> into local tags with the same name), in addition to whatever else would otherwise be fetched. Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the @@ -1086,15 +1086,15 @@ <code>+</code>, followed by the source <src>, followed by a colon <code>:</code>, followed by the destination <dst>. The colon can be omitted when <dst> is empty. <src> is -typically a ref, or a glob pattern with a single * that is used +typically a ref, or a glob pattern with a single <code>*</code> that is used to match a set of refs, but it can also be a fully spelled hex object name.</p> </div> <div class="paragraph"> -<p>A <refspec> may contain a * in its <src> to indicate a simple pattern +<p>A <refspec> may contain a <code>*</code> in its <src> to indicate a simple pattern match. Such a refspec functions like a glob that matches any ref with the -pattern. A pattern <refspec> must have one and only one * in both the <src> and -<dst>. It will map refs to the destination by replacing the * with the +pattern. A pattern <refspec> must have one and only one <code>*</code> in both the <src> and +<dst>. It will map refs to the destination by replacing the <code>*</code> with the contents matched from the source.</p> </div> <div class="paragraph"> @@ -1127,10 +1127,10 @@ </div> <div class="paragraph"> <p>Until Git version 2.20, and unlike when pushing with -<a href="git-push.html">git-push(1)</a>, any updates to <code>refs/tags/</code>* would be accepted +<a href="git-push.html">git-push(1)</a>, any updates to <code>refs/tags/*</code> would be accepted without <code>+</code> in the refspec (or <code>--force</code>). When fetching, we promiscuously considered all tag updates from a remote to be forced fetches. Since -Git version 2.20, fetching to update <code>refs/tags/</code>* works the same way +Git version 2.20, fetching to update <code>refs/tags/*</code> works the same way as when pushing. I.e. any updates will be rejected without <code>+</code> in the refspec (or <code>--force</code>).</p> </div> @@ -1151,7 +1151,7 @@ above about what’s not allowed as an update can be overridden by adding an optional leading <code>+</code> to a refspec (or using the <code>--force</code> command line option). The only exception to this is that no amount of -forcing will make the <code>refs/heads/</code>* namespace accept a non-commit +forcing will make the <code>refs/heads/*</code> namespace accept a non-commit object.</p> </div> <div class="admonitionblock note"> @@ -1713,7 +1713,7 @@ <div class="paragraph"> <p>A globbing refspec must have a non-empty RHS (i.e. must store what were fetched in remote-tracking branches), and its LHS and RHS -must end with <code>/</code>*. The above specifies that all remote +must end with <code>/*</code>. The above specifies that all remote branches are tracked using remote-tracking branches in <code>refs/remotes/origin/</code> hierarchy under the same name.</p> </div>
diff --git a/git-push.html b/git-push.html index 5b2dbb6..24b9966 100644 --- a/git-push.html +++ b/git-push.html
@@ -475,14 +475,14 @@ </div> <div class="paragraph"> <p>When the command line does not specify where to push with the -<em><repository></em> argument, <code>branch.</code>*.<code>remote</code> configuration for the +<em><repository></em> argument, <code>branch.*.remote</code> configuration for the current branch is consulted to determine where to push. If the configuration is missing, it defaults to <em>origin</em>.</p> </div> <div class="paragraph"> <p>When the command line does not specify what to push with <em><refspec></em>... arguments or <code>--all</code>, <code>--mirror</code>, <code>--tags</code> options, the command finds -the default <em><refspec></em> by consulting <code>remote.</code>*.<code>push</code> configuration, +the default <em><refspec></em> by consulting <code>remote.*.push</code> configuration, and if it is not found, honors <code>push.default</code> configuration to decide what to push (See <a href="git-config.html">git-config(1)</a> for the meaning of <code>push.default</code>).</p> </div> @@ -532,7 +532,7 @@ </div> <div class="paragraph"> <p>If <dst> doesn’t start with <code>refs/</code> (e.g. <code>refs/heads/master</code>) we will -try to infer where in <code>refs/</code>* on the destination <repository> it +try to infer where in <code>refs/*</code> on the destination <repository> it belongs based on the type of <src> being pushed and whether <dst> is ambiguous.</p> </div> @@ -562,23 +562,23 @@ <div class="paragraph"> <p>The object referenced by <src> is used to update the <dst> reference on the remote side. Whether this is allowed depends on where in -<code>refs/</code>* the <dst> reference lives as described in detail below, in +<code>refs/*</code> the <dst> reference lives as described in detail below, in those sections "update" means any modifications except deletes, which as noted after the next few sections are treated differently.</p> </div> <div class="paragraph"> -<p>The <code>refs/heads/</code>* namespace will only accept commit objects, and +<p>The <code>refs/heads/*</code> namespace will only accept commit objects, and updates only if they can be fast-forwarded.</p> </div> <div class="paragraph"> -<p>The <code>refs/tags/</code>* namespace will accept any kind of object (as +<p>The <code>refs/tags/*</code> namespace will accept any kind of object (as commits, trees and blobs can be tagged), and any updates to them will be rejected.</p> </div> <div class="paragraph"> <p>It’s possible to push any type of object to any namespace outside of <code>refs/</code>{tags,heads}/*. In the case of tags and commits, these will be -treated as if they were the commits inside <code>refs/heads/</code>* for the +treated as if they were the commits inside <code>refs/heads/*</code> for the purposes of whether the update is allowed.</p> </div> <div class="paragraph"> @@ -593,14 +593,14 @@ </div> <div class="paragraph"> <p>Tree and blob objects outside of <code>refs/</code>{tags,heads}/* will be treated -the same way as if they were inside <code>refs/tags/</code>*, any update of them +the same way as if they were inside <code>refs/tags/*</code>, any update of them will be rejected.</p> </div> <div class="paragraph"> <p>All of the rules described above about what’s not allowed as an update can be overridden by adding an the optional leading <code>+</code> to a refspec (or using <code>--force</code> command line option). The only exception to this -is that no amount of forcing will make the <code>refs/heads/</code>* namespace +is that no amount of forcing will make the <code>refs/heads/*</code> namespace accept a non-commit object. Hooks and configuration can also override or amend these rules, see e.g. <code>receive.denyNonFastForwards</code> in <a href="git-config.html">git-config(1)</a> and <code>pre-receive</code> and <code>update</code> in @@ -634,7 +634,7 @@ <p>Remove remote branches that don’t have a local counterpart. For example a remote branch <code>tmp</code> will be removed if a local branch with the same name doesn’t exist any more. This also respects refspecs, e.g. -<code>git</code> <code>push</code> <code>--prune</code> <code>remote</code> <code>refs/heads/</code>*:refs/tmp/* would +<code>git</code> <code>push</code> <code>--prune</code> <code>remote</code> <code>refs/heads/*:refs/tmp/*</code> would make sure that remote <code>refs/tmp/foo</code> will be removed if <code>refs/heads/foo</code> doesn’t exist.</p> </dd> @@ -859,7 +859,7 @@ <div class="paragraph"> <p>Note that <code>--force</code> applies to all the refs that are pushed, hence using it with <code>push.default</code> set to <code>matching</code> or with multiple push -destinations configured with <code>remote.</code>*.<code>push</code> may overwrite refs +destinations configured with <code>remote.*.push</code> may overwrite refs other than the current branch (including local refs that are strictly behind their remote counterpart). To force a push to only one branch, use a <code>+</code> in front of the refspec to push (e.g <code>git</code> <code>push</code> @@ -1291,7 +1291,7 @@ <dd> <p>for a successfully deleted ref;</p> </dd> -<dt class="hdlist1">*</dt> +<dt class="hdlist1"><code>*</code></dt> <dd> <p>for a successfully pushed new ref;</p> </dd> diff --git a/git-range-diff.html b/git-range-diff.html index cf79e0b..b161621 100644 --- a/git-range-diff.html +++ b/git-range-diff.html
@@ -628,7 +628,7 @@ <h2 id="_configuration">CONFIGURATION</h2> <div class="sectionbody"> <div class="paragraph"> -<p>This command uses the <code>diff.color.</code>* and <code>pager.range-diff</code> settings +<p>This command uses the <code>diff.color.*</code> and <code>pager.range-diff</code> settings (the latter is on by default). See <a href="git-config.html">git-config(1)</a>.</p> </div>
diff --git a/git-receive-pack.html b/git-receive-pack.html index 224bd80..ce4a679 100644 --- a/git-receive-pack.html +++ b/git-receive-pack.html
@@ -677,7 +677,7 @@ the repository.</p> </div> <div class="paragraph"> -<p>The <code>GIT_PUSH_CERT</code>* environment variables can be inspected, just as +<p>The <code>GIT_PUSH_CERT*</code> environment variables can be inspected, just as in <code>pre-receive</code> hook, after accepting a signed push.</p> </div> <div class="paragraph">
diff --git a/git-replay.html b/git-replay.html index 8792ffe..8a6d8be 100644 --- a/git-replay.html +++ b/git-replay.html
@@ -771,7 +771,7 @@ <dd> <p>Pretend as if the bad bisection ref <code>refs/bisect/bad</code> was listed and as if it was followed by <code>--not</code> and the good -bisection refs <code>refs/bisect/good-</code>* on the command +bisection refs <code>refs/bisect/good-*</code> on the command line.</p> </dd> <dt class="hdlist1">--stdin</dt> @@ -1719,7 +1719,7 @@ has no effect.</p> </div> <div class="paragraph"> -<p><code>--date=format:..</code>. feeds the format ... to your system <code>strftime</code>, +<p><code>--date=format:..</code>. feeds the format <code>...</code> to your system <code>strftime</code>, except for %s, %z, and %Z, which are handled internally. Use <code>--date=format:</code>%c to show the date in your system locale’s preferred format. See the <code>strftime</code> manual for a complete list of @@ -1912,7 +1912,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2025-02-15 14:38:14 +0900 +Last updated 2025-02-14 21:38:14 -0800 </div> </div> </body>
diff --git a/git-rerere.html b/git-rerere.html index d531b70..7e7726d 100644 --- a/git-rerere.html +++ b/git-rerere.html
@@ -568,7 +568,7 @@ </div> </div> <div class="paragraph"> -<p>The commits marked with * touch the same area in the same +<p>The commits marked with <code>*</code> touch the same area in the same file; you need to resolve the conflicts when creating the commit marked with <code>+</code>. Then you can test the result to make sure your work-in-progress still works with what is in the latest master.</p> @@ -626,7 +626,7 @@ <p>This would leave only one merge commit when your topic branch is finally ready and merged into the master branch. This merge would require you to resolve the conflict, introduced by the -commits marked with *. However, this conflict is often the +commits marked with <code>*</code>. However, this conflict is often the same conflict you resolved when you created the test merge you blew away. <em>git rerere</em> helps you resolve this final conflicted merge using the information from your earlier hand
diff --git a/git-reset.adoc b/git-reset.adoc index 79ad564..53ab88c 100644 --- a/git-reset.adoc +++ b/git-reset.adoc
@@ -7,23 +7,23 @@ SYNOPSIS -------- -[verse] -'git reset' [-q] [<tree-ish>] [--] <pathspec>... -'git reset' [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>] -'git reset' (--patch | -p) [<tree-ish>] [--] [<pathspec>...] -'git reset' [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] [<commit>] +[synopsis] +git reset [-q] [<tree-ish>] [--] <pathspec>... +git reset [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>] +git reset (--patch | -p) [<tree-ish>] [--] [<pathspec>...] +git reset [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] [<commit>] DESCRIPTION ----------- -In the first three forms, copy entries from `<tree-ish>` to the index. -In the last form, set the current branch head (`HEAD`) to `<commit>`, +In the first three forms, copy entries from _<tree-ish>_ to the index. +In the last form, set the current branch head (`HEAD`) to _<commit>_, optionally modifying index and working tree to match. -The `<tree-ish>`/`<commit>` defaults to `HEAD` in all forms. +The _<tree-ish>_/_<commit>_ defaults to `HEAD` in all forms. -'git reset' [-q] [<tree-ish>] [--] <pathspec>...:: -'git reset' [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>]:: +`git reset [-q] [<tree-ish>] [--] <pathspec>...`:: +`git reset [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>]`:: These forms reset the index entries for all paths that match the - `<pathspec>` to their state at `<tree-ish>`. (It does not affect + _<pathspec>_ to their state at _<tree-ish>_. (It does not affect the working tree or the current branch.) + This means that `git reset <pathspec>` is the opposite of `git add @@ -37,30 +37,30 @@ can copy the contents of a path out of a commit to the index and to the working tree in one go. -'git reset' (--patch | -p) [<tree-ish>] [--] [<pathspec>...]:: +`git reset (--patch | -p) [<tree-ish>] [--] [<pathspec>...]`:: Interactively select hunks in the difference between the index - and `<tree-ish>` (defaults to `HEAD`). The chosen hunks are applied + and _<tree-ish>_ (defaults to `HEAD`). The chosen hunks are applied in reverse to the index. + This means that `git reset -p` is the opposite of `git add -p`, i.e. -you can use it to selectively reset hunks. See the ``Interactive Mode'' +you can use it to selectively reset hunks. See the "Interactive Mode" section of linkgit:git-add[1] to learn how to operate the `--patch` mode. -'git reset' [<mode>] [<commit>]:: - This form resets the current branch head to `<commit>` and - possibly updates the index (resetting it to the tree of `<commit>`) and - the working tree depending on `<mode>`. Before the operation, `ORIG_HEAD` - is set to the tip of the current branch. If `<mode>` is omitted, - defaults to `--mixed`. The `<mode>` must be one of the following: +`git reset [<mode>] [<commit>]`:: + This form resets the current branch head to _<commit>_ and + possibly updates the index (resetting it to the tree of _<commit>_) and + the working tree depending on _<mode>_. Before the operation, `ORIG_HEAD` + is set to the tip of the current branch. If _<mode>_ is omitted, + defaults to `--mixed`. The _<mode>_ must be one of the following: + -- ---soft:: +`--soft`:: Does not touch the index file or the working tree at all (but - resets the head to `<commit>`, just like all modes do). This leaves + resets the head to _<commit>_, just like all modes do). This leaves all your changed files "Changes to be committed", as `git status` would put it. ---mixed:: +`--mixed`:: Resets the index but not the working tree (i.e., the changed files are preserved but not marked for commit) and reports what has not been updated. This is the default action. @@ -68,33 +68,33 @@ If `-N` is specified, removed paths are marked as intent-to-add (see linkgit:git-add[1]). ---hard:: +`--hard`:: Resets the index and working tree. Any changes to tracked files in the - working tree since `<commit>` are discarded. Any untracked files or + working tree since _<commit>_ are discarded. Any untracked files or directories in the way of writing any tracked files are simply deleted. ---merge:: +`--merge`:: Resets the index and updates the files in the working tree that are - different between `<commit>` and `HEAD`, but keeps those which are + different between _<commit>_ and `HEAD`, but keeps those which are different between the index and working tree (i.e. which have changes which have not been added). - If a file that is different between `<commit>` and the index has + If a file that is different between _<commit>_ and the index has unstaged changes, reset is aborted. + In other words, `--merge` does something like a `git read-tree -u -m <commit>`, but carries forward unmerged index entries. ---keep:: +`--keep`:: Resets index entries and updates files in the working tree that are - different between `<commit>` and `HEAD`. - If a file that is different between `<commit>` and `HEAD` has local + different between _<commit>_ and `HEAD`. + If a file that is different between _<commit>_ and `HEAD` has local changes, reset is aborted. ---[no-]recurse-submodules:: - When the working tree is updated, using --recurse-submodules will +`--[no-]recurse-submodules`:: + When the working tree is updated, using `--recurse-submodules` will also recursively reset the working tree of all active submodules according to the commit recorded in the superproject, also setting - the submodules' HEAD to be detached at that commit. + the submodules' `HEAD` to be detached at that commit. -- See "Reset, restore and revert" in linkgit:git[1] for the differences @@ -104,31 +104,31 @@ OPTIONS ------- --q:: ---quiet:: +`-q`:: +`--quiet`:: Be quiet, only report errors. ---refresh:: ---no-refresh:: +`--refresh`:: +`--no-refresh`:: Refresh the index after a mixed reset. Enabled by default. ---pathspec-from-file=<file>:: - Pathspec is passed in `<file>` instead of commandline args. If - `<file>` is exactly `-` then standard input is used. Pathspec - elements are separated by LF or CR/LF. Pathspec elements can be +`--pathspec-from-file=<file>`:: + Pathspec is passed in _<file>_ instead of commandline args. If + _<file>_ is exactly `-` then standard input is used. Pathspec + elements are separated by _LF_ or _CR_/_LF_. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`. ---pathspec-file-nul:: +`--pathspec-file-nul`:: Only meaningful with `--pathspec-from-file`. Pathspec elements are - separated with NUL character and all other characters are taken + separated with _NUL_ character and all other characters are taken literally (including newlines and quotes). -\--:: +`--`:: Do not interpret any more arguments as options. -<pathspec>...:: +`<pathspec>...`:: Limits the paths affected by the operation. + For more details, see the 'pathspec' entry in linkgit:gitglossary[7]. @@ -348,7 +348,7 @@ ------------ + <1> First, reset the history back one commit so that we remove the original - commit, but leave the working tree with all the changes. The -N ensures + commit, but leave the working tree with all the changes. The `-N` ensures that any new files added with `HEAD` are still marked so that `git add -p` will find them. <2> Next, we interactively select diff hunks to add using the `git add -p` @@ -458,7 +458,7 @@ --keep B C C .... -`reset --merge` is meant to be used when resetting out of a conflicted +`git reset --merge` is meant to be used when resetting out of a conflicted merge. Any mergy operation guarantees that the working tree file that is involved in the merge does not have a local change with respect to the index before it starts, and that it writes the result out to the working tree. So if @@ -467,7 +467,7 @@ resetting out from a state that a mergy operation left after failing with a conflict. That is why we disallow `--merge` option in this case. -`reset --keep` is meant to be used when removing some of the last +`git reset --keep` is meant to be used when removing some of the last commits in the current branch while keeping changes in the working tree. If there could be conflicts between the changes in the commit we want to remove and the changes in the working tree we want to keep,
diff --git a/git-reset.html b/git-reset.html index 8d8e64a..68d4fc6 100644 --- a/git-reset.html +++ b/git-reset.html
@@ -452,10 +452,10 @@ <h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<pre class="content"><em>git reset</em> [-q] [<tree-ish>] [--] <pathspec>…​ -<em>git reset</em> [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>] -<em>git reset</em> (--patch | -p) [<tree-ish>] [--] [<pathspec>…​] -<em>git reset</em> [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] [<commit>]</pre> +<pre class="content"><code>git</code> <code>reset</code> [<code>-q</code>] [<em><tree-ish></em>] [<code>--</code>] <em><pathspec></em>…​ +<code>git</code> <code>reset</code> [<code>-q</code>] [<code>--pathspec-from-file=</code><em><file></em> [<code>--pathspec-file-nul</code>]] [<em><tree-ish></em>] +<code>git</code> <code>reset</code> (<code>--patch</code> | <code>-p</code>) [<em><tree-ish></em>] [<code>--</code>] [<em><pathspec></em>…​] +<code>git</code> <code>reset</code> [<code>--soft</code> | <code>--mixed</code> [<code>-N</code>] | <code>--hard</code> | <code>--merge</code> | <code>--keep</code>] [<code>-q</code>] [<em><commit></em>]</pre> </div> </div> </div> @@ -470,8 +470,8 @@ </div> <div class="dlist"> <dl> -<dt class="hdlist1"><em>git reset</em> [-q] [<tree-ish>] [--] <pathspec>…​</dt> -<dt class="hdlist1"><em>git reset</em> [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>]</dt> +<dt class="hdlist1"><code>git</code> <code>reset</code> [<code>-q</code>] [<em><tree-ish></em>] [<code>--</code>] <em><pathspec></em>...</dt> +<dt class="hdlist1"><code>git</code> <code>reset</code> [<code>-q</code>] [<code>--pathspec-from-file=</code><em><file></em> [<code>--pathspec-file-nul</code>]] [<em><tree-ish></em>]</dt> <dd> <p>These forms reset the index entries for all paths that match the <em><pathspec></em> to their state at <em><tree-ish></em>. (It does not affect @@ -490,18 +490,18 @@ working tree in one go.</p> </div> </dd> -<dt class="hdlist1"><em>git reset</em> (--patch | -p) [<tree-ish>] [--] [<pathspec>…​]</dt> +<dt class="hdlist1"><code>git</code> <code>reset</code> (<code>--patch</code> | <code>-p</code>) [<em><tree-ish></em>] [<code>--</code>] [<em><pathspec></em>...]</dt> <dd> <p>Interactively select hunks in the difference between the index and <em><tree-ish></em> (defaults to <code>HEAD</code>). The chosen hunks are applied in reverse to the index.</p> <div class="paragraph"> <p>This means that <code>git</code> <code>reset</code> <code>-p</code> is the opposite of <code>git</code> <code>add</code> <code>-p</code>, i.e. -you can use it to selectively reset hunks. See the “Interactive Mode” +you can use it to selectively reset hunks. See the "Interactive Mode" section of <a href="git-add.html">git-add(1)</a> to learn how to operate the <code>--patch</code> mode.</p> </div> </dd> -<dt class="hdlist1"><em>git reset</em> [<mode>] [<commit>]</dt> +<dt class="hdlist1"><code>git</code> <code>reset</code> [<em><mode></em>] [<em><commit></em>]</dt> <dd> <p>This form resets the current branch head to <em><commit></em> and possibly updates the index (resetting it to the tree of <em><commit></em>) and @@ -512,14 +512,14 @@ <div class="content"> <div class="dlist"> <dl> -<dt class="hdlist1">--soft</dt> +<dt class="hdlist1"><code>--soft</code></dt> <dd> <p>Does not touch the index file or the working tree at all (but resets the head to <em><commit></em>, just like all modes do). This leaves all your changed files "Changes to be committed", as <code>git</code> <code>status</code> would put it.</p> </dd> -<dt class="hdlist1">--mixed</dt> +<dt class="hdlist1"><code>--mixed</code></dt> <dd> <p>Resets the index but not the working tree (i.e., the changed files are preserved but not marked for commit) and reports what has not @@ -529,13 +529,13 @@ <a href="git-add.html">git-add(1)</a>).</p> </div> </dd> -<dt class="hdlist1">--hard</dt> +<dt class="hdlist1"><code>--hard</code></dt> <dd> <p>Resets the index and working tree. Any changes to tracked files in the working tree since <em><commit></em> are discarded. Any untracked files or directories in the way of writing any tracked files are simply deleted.</p> </dd> -<dt class="hdlist1">--merge</dt> +<dt class="hdlist1"><code>--merge</code></dt> <dd> <p>Resets the index and updates the files in the working tree that are different between <em><commit></em> and <code>HEAD</code>, but keeps those which are @@ -548,19 +548,19 @@ but carries forward unmerged index entries.</p> </div> </dd> -<dt class="hdlist1">--keep</dt> +<dt class="hdlist1"><code>--keep</code></dt> <dd> <p>Resets index entries and updates files in the working tree that are different between <em><commit></em> and <code>HEAD</code>. If a file that is different between <em><commit></em> and <code>HEAD</code> has local changes, reset is aborted.</p> </dd> -<dt class="hdlist1">--[no-]recurse-submodules</dt> +<dt class="hdlist1"><code>--</code>[<code>no-</code>]<code>recurse-submodules</code></dt> <dd> -<p>When the working tree is updated, using --recurse-submodules will +<p>When the working tree is updated, using <code>--recurse-submodules</code> will also recursively reset the working tree of all active submodules according to the commit recorded in the superproject, also setting -the submodules' HEAD to be detached at that commit.</p> +the submodules' <code>HEAD</code> to be detached at that commit.</p> </dd> </dl> </div> @@ -580,36 +580,36 @@ <div class="sectionbody"> <div class="dlist"> <dl> -<dt class="hdlist1">-q</dt> -<dt class="hdlist1">--quiet</dt> +<dt class="hdlist1"><code>-q</code></dt> +<dt class="hdlist1"><code>--quiet</code></dt> <dd> <p>Be quiet, only report errors.</p> </dd> -<dt class="hdlist1">--refresh</dt> -<dt class="hdlist1">--no-refresh</dt> +<dt class="hdlist1"><code>--refresh</code></dt> +<dt class="hdlist1"><code>--no-refresh</code></dt> <dd> <p>Refresh the index after a mixed reset. Enabled by default.</p> </dd> -<dt class="hdlist1">--pathspec-from-file=<file></dt> +<dt class="hdlist1"><code>--pathspec-from-file=</code><em><file></em></dt> <dd> <p>Pathspec is passed in <em><file></em> instead of commandline args. If <em><file></em> is exactly <code>-</code> then standard input is used. Pathspec -elements are separated by LF or CR/LF. Pathspec elements can be +elements are separated by <em>LF</em> or <em>CR</em>/<em>LF</em>. Pathspec elements can be quoted as explained for the configuration variable <code>core.quotePath</code> (see <a href="git-config.html">git-config(1)</a>). See also <code>--pathspec-file-nul</code> and global <code>--literal-pathspecs</code>.</p> </dd> -<dt class="hdlist1">--pathspec-file-nul</dt> +<dt class="hdlist1"><code>--pathspec-file-nul</code></dt> <dd> <p>Only meaningful with <code>--pathspec-from-file</code>. Pathspec elements are -separated with NUL character and all other characters are taken +separated with <em>NUL</em> character and all other characters are taken literally (including newlines and quotes).</p> </dd> -<dt class="hdlist1">--</dt> +<dt class="hdlist1"><code>--</code></dt> <dd> <p>Do not interpret any more arguments as options.</p> </dd> -<dt class="hdlist1"><pathspec>…​</dt> +<dt class="hdlist1"><em><pathspec></em>...</dt> <dd> <p>Limits the paths affected by the operation.</p> <div class="paragraph"> @@ -943,7 +943,7 @@ <ol> <li> <p>First, reset the history back one commit so that we remove the original -commit, but leave the working tree with all the changes. The -N ensures +commit, but leave the working tree with all the changes. The <code>-N</code> ensures that any new files added with <code>HEAD</code> are still marked so that <code>git</code> <code>add</code> <code>-p</code> will find them.</p> </li> @@ -1084,7 +1084,7 @@ </div> </div> <div class="paragraph"> -<p><code>reset</code> <code>--merge</code> is meant to be used when resetting out of a conflicted +<p><code>git</code> <code>reset</code> <code>--merge</code> is meant to be used when resetting out of a conflicted merge. Any mergy operation guarantees that the working tree file that is involved in the merge does not have a local change with respect to the index before it starts, and that it writes the result out to the working tree. So if @@ -1094,7 +1094,7 @@ with a conflict. That is why we disallow <code>--merge</code> option in this case.</p> </div> <div class="paragraph"> -<p><code>reset</code> <code>--keep</code> is meant to be used when removing some of the last +<p><code>git</code> <code>reset</code> <code>--keep</code> is meant to be used when removing some of the last commits in the current branch while keeping changes in the working tree. If there could be conflicts between the changes in the commit we want to remove and the changes in the working tree we want to keep, @@ -1145,7 +1145,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2025-02-14 21:38:14 -0800 +Last updated 2025-04-23 15:22:37 -0700 </div> </div> </body>
diff --git a/git-restore.html b/git-restore.html index 7d49c74..31084bb 100644 --- a/git-restore.html +++ b/git-restore.html
@@ -664,7 +664,7 @@ </div> </div> <div class="paragraph"> -<p>Note the quotes around *.<code>c</code>. The file <code>hello.c</code> will also be +<p>Note the quotes around <code>*.c</code>. The file <code>hello.c</code> will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell).</p>
diff --git a/git-rev-list.html b/git-rev-list.html index eae633c..ed7d1e4 100644 --- a/git-rev-list.html +++ b/git-rev-list.html
@@ -1522,7 +1522,7 @@ <p>Limit output to the one commit object which is roughly halfway between included and excluded commits. Note that the bad bisection ref <code>refs/bisect/bad</code> is added to the included commits (if it -exists) and the good bisection refs <code>refs/bisect/good-</code>* are +exists) and the good bisection refs <code>refs/bisect/good-*</code> are added to the excluded commits (if they exist). Thus, supposing there are no refs in <code>refs/bisect/</code>, if</p> <div class="listingblock"> @@ -1697,7 +1697,7 @@ </dd> <dt class="hdlist1">--filter=<filter-spec></dt> <dd> -<p>Only useful with one of the <code>--objects</code>*; omits objects (usually +<p>Only useful with one of the <code>--objects*</code>; omits objects (usually blobs) from the list of printed objects. The <em><filter-spec></em> may be one of the following:</p> <div class="paragraph"> @@ -2008,7 +2008,7 @@ has no effect.</p> </div> <div class="paragraph"> -<p><code>--date=format:..</code>. feeds the format ... to your system <code>strftime</code>, +<p><code>--date=format:..</code>. feeds the format <code>...</code> to your system <code>strftime</code>, except for %s, %z, and %Z, which are handled internally. Use <code>--date=format:</code>%c to show the date in your system locale’s preferred format. See the <code>strftime</code> manual for a complete list of
diff --git a/git-rev-parse.html b/git-rev-parse.html index 8e85be9..ee45a91 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html
@@ -697,7 +697,7 @@ <div class="paragraph"> <p>If a <code>pattern</code> is given, only refs matching the given shell glob are shown. If the pattern does not contain a globbing character (?, -*, or [), it is turned into a prefix match by appending <code>/</code>*.</p> +<code>*</code>, or [), it is turned into a prefix match by appending <code>/*</code>.</p> </div> </dd> <dt class="hdlist1">--glob=<pattern></dt> @@ -705,8 +705,8 @@ <p>Show all refs matching the shell glob pattern <code>pattern</code>. If the pattern does not start with <code>refs/</code>, this is automatically prepended. If the pattern does not contain a globbing -character (?, *, or [), it is turned into a prefix -match by appending <code>/</code>*.</p> +character (?, <code>*</code>, or [), it is turned into a prefix +match by appending <code>/*</code>.</p> </dd> <dt class="hdlist1">--exclude=<glob-pattern></dt> <dd> @@ -1490,7 +1490,7 @@ </dd> <dt class="hdlist1"><em><flags></em></dt> <dd> -<p><em><flags></em> are of *, <code>=</code>, ? or !.</p> +<p><em><flags></em> are of <code>*</code>, <code>=</code>, ? or !.</p> <div class="ulist"> <ul> <li> @@ -1502,7 +1502,7 @@ unambiguously parse the optional argument.</p> </li> <li> -<p>Use * to mean that this option should not be listed in the usage +<p>Use <code>*</code> to mean that this option should not be listed in the usage generated for the <code>-h</code> argument. It’s shown for <code>--help-all</code> as documented in <a href="gitcli.html">gitcli(7)</a>.</p> </li>
diff --git a/git-rm.adoc b/git-rm.adoc index 363a269..b5ead86 100644 --- a/git-rm.adoc +++ b/git-rm.adoc
@@ -7,10 +7,10 @@ SYNOPSIS -------- -[verse] -'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] - [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]] - [--] [<pathspec>...] +[synopsis] +git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] + [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]] + [--] [<pathspec>...] DESCRIPTION ----------- @@ -30,7 +30,7 @@ OPTIONS ------- -<pathspec>...:: +`<pathspec>...`:: Files to remove. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this @@ -43,57 +43,57 @@ `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`. + -For more details, see the 'pathspec' entry in linkgit:gitglossary[7]. +For more details, see the _<pathspec>_ entry in linkgit:gitglossary[7]. --f:: ---force:: +`-f`:: +`--force`:: Override the up-to-date check. --n:: ---dry-run:: +`-n`:: +`--dry-run`:: Don't actually remove any file(s). Instead, just show if they exist in the index and would otherwise be removed by the command. --r:: +`-r`:: Allow recursive removal when a leading directory name is given. -\--:: +`--`:: This option can be used to separate command-line options from the list of files, (useful when filenames might be mistaken for command-line options). ---cached:: +`--cached`:: Use this option to unstage and remove paths only from the index. Working tree files, whether modified or not, will be left alone. ---ignore-unmatch:: +`--ignore-unmatch`:: Exit with a zero status even if no files matched. ---sparse:: +`--sparse`:: Allow updating index entries outside of the sparse-checkout cone. Normally, `git rm` refuses to update index entries whose paths do not fit within the sparse-checkout cone. See linkgit:git-sparse-checkout[1] for more. --q:: ---quiet:: +`-q`:: +`--quiet`:: `git rm` normally outputs one line (in the form of an `rm` command) for each file removed. This option suppresses that output. ---pathspec-from-file=<file>:: - Pathspec is passed in `<file>` instead of commandline args. If - `<file>` is exactly `-` then standard input is used. Pathspec - elements are separated by LF or CR/LF. Pathspec elements can be +`--pathspec-from-file=<file>`:: + Pathspec is passed in _<file>_ instead of args. If + _<file>_ is exactly `-` then standard input is used. Pathspec + elements are separated by _LF_ or _CR_/_LF_. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`. ---pathspec-file-nul:: +`--pathspec-file-nul`:: Only meaningful with `--pathspec-from-file`. Pathspec elements are - separated with NUL character and all other characters are taken + separated with _NUL_ character and all other characters are taken literally (including newlines and quotes). @@ -153,15 +153,15 @@ ---------- Only submodules using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will be removed from the work -tree, as their repository lives inside the .git directory of the +tree, as their repository lives inside the `.git` directory of the superproject. If a submodule (or one of those nested inside it) -still uses a .git directory, `git rm` will move the submodules +still uses a `.git` directory, `git rm` moves the submodules git directory into the superprojects git directory to protect -the submodule's history. If it exists the submodule.<name> section +the submodule's history. If it exists the `submodule.<name>` section in the linkgit:gitmodules[5] file will also be removed and that file -will be staged (unless --cached or -n are used). +will be staged (unless `--cached` or `-n` are used). -A submodule is considered up to date when the HEAD is the same as +A submodule is considered up to date when the `HEAD` is the same as recorded in the index, no tracked files are modified and no untracked files that aren't ignored are present in the submodule's work tree. Ignored files are deemed expendable and won't stop a submodule's work
diff --git a/git-rm.html b/git-rm.html index 987fac5..d33c6ab 100644 --- a/git-rm.html +++ b/git-rm.html
@@ -452,9 +452,9 @@ <h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<pre class="content"><em>git rm</em> [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] - [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]] - [--] [<pathspec>…​]</pre> +<pre class="content"><code>git</code> <code>rm</code> [<code>-f</code> | <code>--force</code>] [<code>-n</code>] [<code>-r</code>] [<code>--cached</code>] [<code>--ignore-unmatch</code>] + [<code>--quiet</code>] [<code>--pathspec-from-file=</code><em><file></em> [<code>--pathspec-file-nul</code>]] + [<code>--</code>] [<em><pathspec></em>…​]</pre> </div> </div> </div> @@ -482,7 +482,7 @@ <div class="sectionbody"> <div class="dlist"> <dl> -<dt class="hdlist1"><pathspec>…​</dt> +<dt class="hdlist1"><em><pathspec></em>...</dt> <dd> <p>Files to remove. A leading directory name (e.g. <code>dir</code> to remove <code>dir/file1</code> and <code>dir/file2</code>) can be given to remove all files in @@ -498,68 +498,68 @@ of directory <code>d2</code>.</p> </div> <div class="paragraph"> -<p>For more details, see the <em>pathspec</em> entry in <a href="gitglossary.html">gitglossary(7)</a>.</p> +<p>For more details, see the <em><pathspec></em> entry in <a href="gitglossary.html">gitglossary(7)</a>.</p> </div> </dd> -<dt class="hdlist1">-f</dt> -<dt class="hdlist1">--force</dt> +<dt class="hdlist1"><code>-f</code></dt> +<dt class="hdlist1"><code>--force</code></dt> <dd> <p>Override the up-to-date check.</p> </dd> -<dt class="hdlist1">-n</dt> -<dt class="hdlist1">--dry-run</dt> +<dt class="hdlist1"><code>-n</code></dt> +<dt class="hdlist1"><code>--dry-run</code></dt> <dd> <p>Don’t actually remove any file(s). Instead, just show if they exist in the index and would otherwise be removed by the command.</p> </dd> -<dt class="hdlist1">-r</dt> +<dt class="hdlist1"><code>-r</code></dt> <dd> <p>Allow recursive removal when a leading directory name is given.</p> </dd> -<dt class="hdlist1">--</dt> +<dt class="hdlist1"><code>--</code></dt> <dd> <p>This option can be used to separate command-line options from the list of files, (useful when filenames might be mistaken for command-line options).</p> </dd> -<dt class="hdlist1">--cached</dt> +<dt class="hdlist1"><code>--cached</code></dt> <dd> <p>Use this option to unstage and remove paths only from the index. Working tree files, whether modified or not, will be left alone.</p> </dd> -<dt class="hdlist1">--ignore-unmatch</dt> +<dt class="hdlist1"><code>--ignore-unmatch</code></dt> <dd> <p>Exit with a zero status even if no files matched.</p> </dd> -<dt class="hdlist1">--sparse</dt> +<dt class="hdlist1"><code>--sparse</code></dt> <dd> <p>Allow updating index entries outside of the sparse-checkout cone. Normally, <code>git</code> <code>rm</code> refuses to update index entries whose paths do not fit within the sparse-checkout cone. See <a href="git-sparse-checkout.html">git-sparse-checkout(1)</a> for more.</p> </dd> -<dt class="hdlist1">-q</dt> -<dt class="hdlist1">--quiet</dt> +<dt class="hdlist1"><code>-q</code></dt> +<dt class="hdlist1"><code>--quiet</code></dt> <dd> <p><code>git</code> <code>rm</code> normally outputs one line (in the form of an <code>rm</code> command) for each file removed. This option suppresses that output.</p> </dd> -<dt class="hdlist1">--pathspec-from-file=<file></dt> +<dt class="hdlist1"><code>--pathspec-from-file=</code><em><file></em></dt> <dd> -<p>Pathspec is passed in <em><file></em> instead of commandline args. If +<p>Pathspec is passed in <em><file></em> instead of args. If <em><file></em> is exactly <code>-</code> then standard input is used. Pathspec -elements are separated by LF or CR/LF. Pathspec elements can be +elements are separated by <em>LF</em> or <em>CR</em>/<em>LF</em>. Pathspec elements can be quoted as explained for the configuration variable <code>core.quotePath</code> (see <a href="git-config.html">git-config(1)</a>). See also <code>--pathspec-file-nul</code> and global <code>--literal-pathspecs</code>.</p> </dd> -<dt class="hdlist1">--pathspec-file-nul</dt> +<dt class="hdlist1"><code>--pathspec-file-nul</code></dt> <dd> <p>Only meaningful with <code>--pathspec-from-file</code>. Pathspec elements are -separated with NUL character and all other characters are taken +separated with <em>NUL</em> character and all other characters are taken literally (including newlines and quotes).</p> </dd> </dl> @@ -641,16 +641,16 @@ <div class="paragraph"> <p>Only submodules using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will be removed from the work -tree, as their repository lives inside the .git directory of the +tree, as their repository lives inside the .<code>git</code> directory of the superproject. If a submodule (or one of those nested inside it) -still uses a .git directory, <code>git</code> <code>rm</code> will move the submodules +still uses a .<code>git</code> directory, <code>git</code> <code>rm</code> moves the submodules git directory into the superprojects git directory to protect -the submodule’s history. If it exists the submodule.<name> section +the submodule’s history. If it exists the <code>submodule.</code><em><name></em> section in the <a href="gitmodules.html">gitmodules(5)</a> file will also be removed and that file -will be staged (unless --cached or -n are used).</p> +will be staged (unless <code>--cached</code> or <code>-n</code> are used).</p> </div> <div class="paragraph"> -<p>A submodule is considered up to date when the HEAD is the same as +<p>A submodule is considered up to date when the <code>HEAD</code> is the same as recorded in the index, no tracked files are modified and no untracked files that aren’t ignored are present in the submodule’s work tree. Ignored files are deemed expendable and won’t stop a submodule’s work @@ -668,17 +668,17 @@ <div class="sectionbody"> <div class="dlist"> <dl> -<dt class="hdlist1"><code>git</code> <code>rm</code> <code>Documentation/</code>\*.<code>txt</code></dt> +<dt class="hdlist1"><code>git</code> <code>rm</code> <code>Documentation/\*.txt</code></dt> <dd> -<p>Removes all *.<code>txt</code> files from the index that are under the +<p>Removes all <code>*.txt</code> files from the index that are under the <code>Documentation</code> directory and any of its subdirectories.</p> <div class="paragraph"> -<p>Note that the asterisk * is quoted from the shell in this +<p>Note that the asterisk <code>*</code> is quoted from the shell in this example; this lets Git, and not the shell, expand the pathnames of files and subdirectories under the <code>Documentation/</code> directory.</p> </div> </dd> -<dt class="hdlist1"><code>git</code> <code>rm</code> <code>-f</code> <code>git-</code>*.<code>sh</code></dt> +<dt class="hdlist1"><code>git</code> <code>rm</code> <code>-f</code> <code>git-*.sh</code></dt> <dd> <p>Because this example lets the shell expand the asterisk (i.e. you are listing the files explicitly), it @@ -720,7 +720,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2025-02-14 21:38:14 -0800 +Last updated 2025-04-23 15:22:37 -0700 </div> </div> </body>
diff --git a/git-shortlog.html b/git-shortlog.html index 7cef6da..a4cd60e 100644 --- a/git-shortlog.html +++ b/git-shortlog.html
@@ -864,7 +864,7 @@ <dd> <p>Pretend as if the bad bisection ref <code>refs/bisect/bad</code> was listed and as if it was followed by <code>--not</code> and the good -bisection refs <code>refs/bisect/good-</code>* on the command +bisection refs <code>refs/bisect/good-*</code> on the command line.</p> </dd> <dt class="hdlist1">--stdin</dt> @@ -1565,7 +1565,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2025-02-15 14:38:14 +0900 +Last updated 2025-02-14 21:38:14 -0800 </div> </div> </body>
diff --git a/git-show-branch.html b/git-show-branch.html index c0343f6..811cb83 100644 --- a/git-show-branch.html +++ b/git-show-branch.html
@@ -493,7 +493,7 @@ <p>A glob pattern that matches branch or tag names under refs/. For example, if you have many topic branches under refs/heads/topic, giving -<code>topic/</code>* would show all of them.</p> +<code>topic/*</code> would show all of them.</p> </dd> <dt class="hdlist1">-r</dt> <dt class="hdlist1">--remotes</dt> @@ -586,7 +586,7 @@ </dd> <dt class="hdlist1">--color[=<when>]</dt> <dd> -<p>Color the status sign (one of these: * ! <code>+</code> <code>-</code>) of each commit +<p>Color the status sign (one of these: <code>*</code> ! <code>+</code> <code>-</code>) of each commit corresponding to the branch it’s in. The value must be always (the default), never, or auto.</p> </dd> @@ -610,7 +610,7 @@ <div class="paragraph"> <p>Given N <ref>s, the first N lines are the one-line description from their commit message. The branch head that is pointed at by -$GIT_DIR/HEAD is prefixed with an asterisk * character while other +$GIT_DIR/HEAD is prefixed with an asterisk <code>*</code> character while other heads are prefixed with a ! character.</p> </div> <div class="paragraph">
diff --git a/git-show-ref.html b/git-show-ref.html index cd3e004..b94d7c5 100644 --- a/git-show-ref.html +++ b/git-show-ref.html
@@ -547,7 +547,7 @@ <dt class="hdlist1">--exclude-existing[=<pattern>]</dt> <dd> <p>Make <code>git</code> <code>show-ref</code> act as a filter that reads refs from stdin of the -form <code>^</code>(?:<em><anything></em>\s)?<em><refname></em>(?:\^{})?$ +form <code>^</code>(?:<em><anything></em><code>\s</code>)?<em><refname></em>(?:\^{})?$ and performs the following actions on each: (1) strip <code>^</code>{} at the end of line if any; (2) ignore if pattern is provided and does not head-match refname; @@ -686,7 +686,7 @@ <h2 id="_files">FILES</h2> <div class="sectionbody"> <div class="paragraph"> -<p>.<code>git/refs/</code>*, .<code>git/packed-refs</code></p> +<p>.<code>git/refs/*</code>, .<code>git/packed-refs</code></p> </div> </div> </div> diff --git a/git-show.html b/git-show.html index 1c80df8..8c6c3b6 100644 --- a/git-show.html +++ b/git-show.html
@@ -1633,7 +1633,7 @@ while setting <code>diff.statNameWidth</code> or <code>diff.statGraphWidth</code> does not affect <code>git</code> <code>format-patch</code>. By giving a third parameter <em><count></em>, you can limit the output to -the first <em><count></em> lines, followed by ... if there are more.</p> +the first <em><count></em> lines, followed by <code>...</code> if there are more.</p> <div class="paragraph"> <p>These parameters can also be set individually with <code>--stat-width=</code><em><width></em>, <code>--stat-name-width=</code><em><name-width></em> and <code>--stat-count=</code><em><count></em>.</p> @@ -1691,7 +1691,7 @@ natural concept of lines). This is a more expensive <code>--dirstat</code> behavior than the <code>changes</code> behavior, but it does count rearranged lines within a file as much as other changes. The resulting output -is consistent with what you get from the other <code>--</code>*stat options.</p> +is consistent with what you get from the other <code>--*stat</code> options.</p> </dd> <dt class="hdlist1"><code>files</code></dt> <dd> @@ -2108,7 +2108,7 @@ exceeds the specified number. Defaults to <code>diff.renameLimit</code>. Note that a value of 0 is treated as unlimited.</p> </dd> -<dt class="hdlist1"><code>--diff-filter=</code>[(<code>A</code>|<code>C</code>|<code>D</code>|<code>M</code>|<code>R</code>|<code>T</code>|<code>U</code>|<code>X</code>|<code>B</code>)<code>...</code>[*]]</dt> +<dt class="hdlist1"><code>--diff-filter=</code>[(<code>A</code>|<code>C</code>|<code>D</code>|<code>M</code>|<code>R</code>|<code>T</code>|<code>U</code>|<code>X</code>|<code>B</code>)<code>...</code>[<code>*</code>]]</dt> <dd> <p>Select only files that are Added (<code>A</code>), Copied (<code>C</code>), Deleted (<code>D</code>), Modified (<code>M</code>), Renamed (<code>R</code>), have their @@ -2116,7 +2116,7 @@ are Unmerged (<code>U</code>), are Unknown (<code>X</code>), or have had their pairing Broken (<code>B</code>). Any combination of the filter characters (including none) can be used. -When * (All-or-none) is added to the combination, all +When <code>*</code> (All-or-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected.</p> @@ -2229,7 +2229,7 @@ </li> <li> <p>Lines starting with a hash ("#") are ignored, so they can be used -for comments. Add a backslash ("\") to the beginning of the +for comments. Add a backslash ("<code>\</code>") to the beginning of the pattern if it starts with a hash.</p> </li> <li> @@ -2243,7 +2243,7 @@ <p>Patterns have the same syntax and semantics as patterns used for <code>fnmatch</code>(3) without the <code>FNM_PATHNAME</code> flag, except a pathname also matches a pattern if removing any number of the final pathname -components matches the pattern. For example, the pattern "<code>foo</code>*bar" +components matches the pattern. For example, the pattern "<code>foo*bar</code>" matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<code>foobarx</code>".</p> </div> </dd> @@ -2453,7 +2453,7 @@ <code>rename</code> <code>to</code> <em><path></em> <code>similarity</code> <code>index</code> <em><number></em> <code>dissimilarity</code> <code>index</code> <em><number></em> -<code>index</code> <em><hash></em>`..`<em><hash></em> <em><mode></em></pre> +<code>index</code> <em><hash></em><code>..</code><em><hash></em> <em><mode></em></pre> </div> <div class="paragraph"> <p>File modes <em><mode></em> are printed as 6-digit octal numbers including the file type @@ -2575,9 +2575,9 @@ <p>It is followed by one or more extended header lines (this example shows a merge with two parents):</p> <div class="verseblock"> -<pre class="content"><code>index</code> <em><hash></em><code>,</code><em><hash></em>`..<code>__</code><em><hash></em><code>__</code> -{empty}`mode <em><mode></em><code>,</code><em><mode></em>``..``<em><mode></em> -<code>new</code> <code>file</code> <code>mode</code> <em><mode></em> +<pre class="content"><code>index</code> <em><hash></em><code>,</code><em><hash></em><code>..</code><em><hash></em> +<code>mode</code> <em><mode></em><code>,</code><em><mode></em>`<code>..</code><code>__</code><em><mode></em><code>__</code> +{empty}`new <code>file</code> <code>mode</code> <em><mode></em> <code>deleted</code> <code>file</code> <code>mode</code> <em><mode></em><code>,</code><em><mode></em></pre> </div> <div class="paragraph"> diff --git a/git-svn.html b/git-svn.html index aa32131..ff98372 100644 --- a/git-svn.html +++ b/git-svn.html
@@ -643,7 +643,7 @@ <dd> <p>Ignore refs for branches or tags matching the Perl regular expression. A "negative look-ahead assertion" like -<code>^refs/remotes/origin/</code>(?!tags/wanted-tag|<code>wanted-branch</code>).*$ +<code>^refs/remotes/origin/</code>(?!tags/wanted-tag|<code>wanted-branch</code>)<code>.*$</code> can be used to allow only certain refs.</p> <div class="verseblock"> <pre class="content">config key: svn-remote.<name>.ignore-refs</pre> @@ -1843,7 +1843,7 @@ </div> </div> <div class="paragraph"> -<p>Keep in mind that the * (asterisk) wildcard of the local ref +<p>Keep in mind that the <code>*</code> (asterisk) wildcard of the local ref (right of the <code>:</code>) <strong>must</strong> be the farthest right path component; however the remote wildcard may be anywhere as long as it’s an independent path component (surrounded by <code>/</code> or EOL). This
diff --git a/git-tag.html b/git-tag.html index a008b88..33eeab4 100644 --- a/git-tag.html +++ b/git-tag.html
@@ -666,7 +666,7 @@ <p>Specify a (<token>, <value>) pair that should be applied as a trailer. (e.g. <code>git</code> <code>tag</code> <code>--trailer</code> "Custom-Key: <code>value</code>" will add a "Custom-Key" trailer to the tag message.) -The <code>trailer.</code>* configuration variables +The <code>trailer.*</code> configuration variables (<a href="git-interpret-trailers.html">git-interpret-trailers(1)</a>) can be used to define if a duplicated trailer is omitted, where in the run of trailers each trailer would appear, and other details.
diff --git a/git-update-ref.html b/git-update-ref.html index 5de8825..1a92df6 100644 --- a/git-update-ref.html +++ b/git-update-ref.html
@@ -480,7 +480,7 @@ <p>The final arguments are object names; this command without any options does not support updating a symbolic ref to point to another ref (see <a href="git-symbolic-ref.html">git-symbolic-ref(1)</a>). But <code>git</code> <code>update-ref</code> <code>--stdin</code> does have -the <code>symref-</code>* commands so that regular refs and symbolic refs can be +the <code>symref-*</code> commands so that regular refs and symbolic refs can be committed in the same transaction.</p> </div> <div class="paragraph">
diff --git a/git-var.html b/git-var.html index f9f825a..31be574 100644 --- a/git-var.html +++ b/git-var.html
@@ -509,7 +509,7 @@ <dd> <p>Text editor for use by Git commands. The value is meant to be interpreted by the shell when it is used. Examples: <code>~/bin/vi</code>, -<code>$SOME_ENVIRONMENT_VARIABLE</code>, "C:\Program <code>Files</code>\Vim\gvim.<code>exe</code>" +<code>$SOME_ENVIRONMENT_VARIABLE</code>, "C:\Program <code>Files\Vim\gvim.exe</code>" <code>--nofork</code>. The order of preference is the <code>$GIT_EDITOR</code> environment variable, then <code>core.editor</code> configuration, then <code>$VISUAL</code>, then <code>$EDITOR</code>, and then the default chosen at compile
diff --git a/git.html b/git.html index 86626a2..62718e7 100644 --- a/git.html +++ b/git.html
@@ -2354,8 +2354,8 @@ <p>Setting this Boolean environment variable to true will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running <code>GIT_LITERAL_PATHSPECS=1</code> <code>git</code> <code>log</code> <code>--</code> '*.<code>c</code>' will search -for commits that touch the path *.<code>c</code>, not any paths that the -glob *.<code>c</code> matches. You might want this if you are feeding +for commits that touch the path <code>*.c</code>, not any paths that the +glob <code>*.c</code> matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by <code>git</code> <code>ls-tree</code>, <code>--raw</code> diff output, etc).</p> </dd> @@ -2477,7 +2477,7 @@ inheritable (and consequently <strong>every</strong> spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication -(e.g. \\.\pipe\my-git-stdin-123).</p> +(e.g. <code>\\.\pipe\my-git-stdin-123</code>).</p> <div class="paragraph"> <p>Two special values are supported: <code>off</code> will simply close the corresponding standard handle, and if <code>GIT_REDIRECT_STDERR</code> is @@ -2500,7 +2500,7 @@ <p>If set to <code>0</code>, then disable all advice messages. These messages are intended to provide hints to human users that may help them get out of problematic situations or take advantage of new features. Users can -disable individual messages using the <code>advice.</code>* config keys. These +disable individual messages using the <code>advice.*</code> config keys. These messages may be disruptive to tools that execute Git processes, so this variable is available to disable the messages. (The <code>--no-advice</code> global option is also available, but old Git versions may fail when @@ -2699,7 +2699,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2025-02-22 06:44:53 +0900 +Last updated 2025-02-21 13:44:53 -0800 </div> </div> </body>
diff --git a/gitattributes.html b/gitattributes.html index 4ff5872..8327c80 100644 --- a/gitattributes.html +++ b/gitattributes.html
@@ -528,7 +528,7 @@ <li> <p>patterns that match a directory do not recursively match paths inside that directory (so using the trailing-slash <code>path/</code> syntax is -pointless in an attributes file; use <code>path/</code>** instead)</p> +pointless in an attributes file; use <code>path/**</code> instead)</p> </li> </ul> </div> @@ -851,9 +851,9 @@ in your repository, then it is strongly recommended to ensure that all clients working with the repository support it.</p> <div class="paragraph"> -<p>For example, Microsoft Visual Studio resources files (*.<code>rc</code>) or -PowerShell script files (*.<code>ps1</code>) are sometimes encoded in UTF-16. -If you declare *.<code>ps1</code> as files as UTF-16 and you add <code>foo.ps1</code> with +<p>For example, Microsoft Visual Studio resources files (<code>*.rc</code>) or +PowerShell script files (<code>*.ps1</code>) are sometimes encoded in UTF-16. +If you declare <code>*.ps1</code> as files as UTF-16 and you add <code>foo.ps1</code> with a <code>working-tree-encoding</code> enabled Git client, then <code>foo.ps1</code> will be stored as UTF-8 internally. A client without <code>working-tree-encoding</code> support will checkout <code>foo.ps1</code> as UTF-8 encoded file. This will @@ -1728,7 +1728,7 @@ example, you might want to use <code>textconv</code> to convert postscript files to an ASCII representation for human viewing, but otherwise treat them as binary files. You cannot specify both <code>-diff</code> and <code>diff=ps</code> attributes. -The solution is to use the <code>diff.</code>*.<code>binary</code> config option:</p> +The solution is to use the <code>diff.*.binary</code> config option:</p> </div> <div class="listingblock"> <div class="content"> @@ -1837,11 +1837,11 @@ </div> </div> <div class="paragraph"> -<p>The <code>merge.</code>*.<code>name</code> variable gives the driver a human-readable +<p>The <code>merge.*.name</code> variable gives the driver a human-readable name.</p> </div> <div class="paragraph"> -<p>The <code>merge.</code>*.<code>driver</code> variable’s value is used to construct a +<p>The <code>merge.*.driver</code> variable’s value is used to construct a command to run to common ancestor’s version (%O), current version (%A) and the other branches' version (%B). These three tokens are replaced with the names of temporary files that @@ -1859,7 +1859,7 @@ different from producing a conflict).</p> </div> <div class="paragraph"> -<p>The <code>merge.</code>*.<code>recursive</code> variable specifies what other merge +<p>The <code>merge.*.recursive</code> variable specifies what other merge driver to use when the merge driver is called for an internal merge between common ancestors, when there are more than one. When left unspecified, the driver itself is used for both @@ -2125,7 +2125,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2025-03-10 09:41:59 -0700 +Last updated 2025-03-26 00:41:02 -0700 </div> </div> </body>
diff --git a/gitcli.html b/gitcli.html index b4664f8..ac79093 100644 --- a/gitcli.html +++ b/gitcli.html
@@ -526,7 +526,7 @@ <div class="paragraph"> <p>The former lets your shell expand the fileglob, and you are asking the dot-C files in your working tree to be overwritten with the version -in the index. The latter passes the *.<code>c</code> to Git, and you are asking +in the index. The latter passes the <code>*.c</code> to Git, and you are asking the paths in the index that match the pattern to be checked out to your working tree. After running <code>git</code> <code>add</code> <code>hello.c</code>; <code>rm</code> <code>hello.c</code>, you will <em>not</em> see <code>hello.c</code> in your working tree with the former, but with the latter @@ -789,7 +789,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2025-02-14 21:38:14 -0800 +Last updated 2025-03-26 00:41:02 -0700 </div> </div> </body>
diff --git a/gitcore-tutorial.html b/gitcore-tutorial.html index bbfaf82..0bc59ff 100644 --- a/gitcore-tutorial.html +++ b/gitcore-tutorial.html
@@ -595,7 +595,7 @@ and a reference to an object is always the 40-byte hex representation of that SHA-1 name. The files in the <code>refs</code> subdirectory are expected to contain these hex references -(usually with a final \n at the end), and you should thus +(usually with a final <code>\n</code> at the end), and you should thus expect to see a number of 41-byte files containing these references in these <code>refs</code> subdirectories when you actually start populating your tree. @@ -1648,11 +1648,11 @@ <div class="paragraph"> <p>The first two lines indicate that it is showing the two branches with the titles of their top-of-the-tree commits, you are currently on -<code>master</code> branch (notice the asterisk * character), and the first +<code>master</code> branch (notice the asterisk <code>*</code> character), and the first column for the later output lines is used to show commits contained in the <code>master</code> branch, and the second column for the <code>mybranch</code> branch. Three commits are shown along with their titles. -All of them have non blank characters in the first column (* +All of them have non blank characters in the first column (<code>*</code> shows an ordinary commit on the current branch, <code>-</code> is a merge commit), which means they are now part of the <code>master</code> branch. Only the "Some work" commit has the plus <code>+</code> character in the second column, @@ -2258,7 +2258,7 @@ <div class="title">Note</div> </td> <td class="content"> -You will see two files, <code>pack-</code>*.<code>pack</code> and <code>pack-</code>*.<code>idx</code>, +You will see two files, <code>pack-*.pack</code> and <code>pack-*.idx</code>, in .<code>git/objects/pack</code> directory. They are closely related to each other, and if you ever copy them by hand to a different repository for whatever reason, you should make sure you copy
diff --git a/gitcredentials.html b/gitcredentials.html index 08893b8..62434f1 100644 --- a/gitcredentials.html +++ b/gitcredentials.html
@@ -542,7 +542,7 @@ </div> <div class="paragraph"> <p>You may also have third-party helpers installed; search for -<code>credential-</code>* in the output of <code>git</code> <code>help</code> <code>-a</code>, and consult the +<code>credential-*</code> in the output of <code>git</code> <code>help</code> <code>-a</code>, and consult the documentation of individual helpers. Once you have selected a helper, you can tell Git to use it by putting its name into the credential.helper variable.</p> @@ -679,7 +679,7 @@ compares hostnames exactly, without considering whether two hosts are part of the same domain. Likewise, a config entry for <code>http://example.com</code> would not match: Git compares the protocols exactly. However, you may use wildcards in -the domain name and other pattern matching techniques as with the <code>http.</code><em><URL></em>.* +the domain name and other pattern matching techniques as with the <code>http.</code><em><URL></em><code>.*</code> options.</p> </div> <div class="paragraph"> @@ -696,8 +696,8 @@ <div class="sectionbody"> <div class="paragraph"> <p>Options for a credential context can be configured either in -<code>credential.</code>* (which applies to all credentials), or -<code>credential.</code><em><URL></em>.*, where <URL> matches the context as described +<code>credential.*</code> (which applies to all credentials), or +<code>credential.</code><em><URL></em><code>.*</code>, where <URL> matches the context as described above.</p> </div> <div class="paragraph">
diff --git a/giteveryday.html b/giteveryday.html index 1f264d3..704e971 100644 --- a/giteveryday.html +++ b/giteveryday.html
@@ -757,14 +757,14 @@ <li> <p>clone sets these configuration variables by default. It arranges <code>git</code> <code>pull</code> to fetch and store the branches of mothership -machine to local <code>remotes/origin/</code>* remote-tracking branches.</p> +machine to local <code>remotes/origin/*</code> remote-tracking branches.</p> </li> <li> <p>arrange <code>git</code> <code>push</code> to push all local branches to their corresponding branch of the mothership machine.</p> </li> <li> -<p>push will stash all our work away on <code>remotes/satellite/</code>* +<p>push will stash all our work away on <code>remotes/satellite/*</code> remote-tracking branches on the mothership machine. You could use this as a back-up method. Likewise, you can pretend that mothership "fetched" from you (useful when access is one sided).</p>
diff --git a/gitfaq.html b/gitfaq.html index b5da901..4c998e1 100644 --- a/gitfaq.html +++ b/gitfaq.html
@@ -545,7 +545,7 @@ your editor normally detaches from the terminal when invoked, you should specify it with an argument that makes it not do that, or else Git will not see any changes. An example of a configuration addressing both of these issues on -Windows would be the configuration "C:\Program <code>Files</code>\Vim\gvim.<code>exe</code>" <code>--nofork</code>, +Windows would be the configuration "C:\Program <code>Files\Vim\gvim.exe</code>" <code>--nofork</code>, which quotes the filename with spaces and specifies the <code>--nofork</code> option to avoid backgrounding the process.</p> </div> @@ -892,7 +892,7 @@ <dd> <p>In general, there are a variety of problems that can occur when using squash merges to merge two branches multiple times. These can include seeing extra -commits in <code>git</code> <code>log</code> output, with a GUI, or when using the ... notation to +commits in <code>git</code> <code>log</code> output, with a GUI, or when using the <code>...</code> notation to express a range, as well as the possibility of needing to re-resolve conflicts again and again.</p> <div class="paragraph"> @@ -911,7 +911,7 @@ means that the merge base for these branches won’t have changed, and so when Git goes to perform its next merge, it considers all of the changes that it considered the last time plus the new changes. That means any conflicts may -need to be re-resolved. Similarly, anything using the ... notation in <code>git</code> +need to be re-resolved. Similarly, anything using the <code>...</code> notation in <code>git</code> <code>diff</code>, <code>git</code> <code>log</code>, or a GUI will result in showing all of the changes since the original merge base.</p> </div>
diff --git a/gitglossary.html b/gitglossary.html index ce7f8f8..63d9a43 100644 --- a/gitglossary.html +++ b/gitglossary.html
@@ -936,7 +936,7 @@ </dd> <dt class="hdlist1">literal</dt> <dd> -<p>Wildcards in the pattern such as * or ? are treated +<p>Wildcards in the pattern such as <code>*</code> or ? are treated as literal characters.</p> </dd> <dt class="hdlist1">icase</dt> @@ -952,26 +952,26 @@ "Documentation/git.html" but not "Documentation/ppc/ppc.html" or "tools/perf/Documentation/perf.html".</p> <div class="paragraph"> -<p>Two consecutive asterisks ("**") in patterns matched against +<p>Two consecutive asterisks ("<code>**</code>") in patterns matched against full pathname may have special meaning:</p> </div> <div class="ulist"> <ul> <li> -<p>A leading "**" followed by a slash means match in all -directories. For example, "**/foo" matches file or directory -"<code>foo</code>" anywhere, the same as pattern "<code>foo</code>". "**/foo/bar" +<p>A leading "<code>**</code>" followed by a slash means match in all +directories. For example, "<code>**/foo</code>" matches file or directory +"<code>foo</code>" anywhere, the same as pattern "<code>foo</code>". "<code>**/foo/bar</code>" matches file or directory "<code>bar</code>" anywhere that is directly under directory "<code>foo</code>".</p> </li> <li> -<p>A trailing "<code>/</code>**" matches everything inside. For example, -"<code>abc/</code>**" matches all files inside directory "abc", relative +<p>A trailing "<code>/**</code>" matches everything inside. For example, +"<code>abc/**</code>" matches all files inside directory "abc", relative to the location of the .<code>gitignore</code> file, with infinite depth.</p> </li> <li> <p>A slash followed by two consecutive asterisks then a slash -matches zero or more directories. For example, "<code>a/</code>**/b" +matches zero or more directories. For example, "<code>a/**/b</code>" matches "<code>a/b</code>", "<code>a/x/b</code>", "<code>a/x/y/b</code>" and so on.</p> </li> <li> diff --git a/gitignore.html b/gitignore.html index 7010dc5..e155cc6 100644 --- a/gitignore.html +++ b/gitignore.html
@@ -545,12 +545,12 @@ </li> <li> <p>A line starting with # serves as a comment. -Put a backslash ("\") in front of the first hash for patterns +Put a backslash ("<code>\</code>") in front of the first hash for patterns that begin with a hash.</p> </li> <li> <p>Trailing spaces are ignored unless they are quoted with backslash -("\").</p> +("<code>\</code>").</p> </li> <li> <p>An optional prefix "!" which negates the pattern; any @@ -559,8 +559,8 @@ directory of that file is excluded. Git doesn’t list excluded directories for performance reasons, so any patterns on contained files have no effect, no matter where they are defined. -Put a backslash ("\") in front of the first "!" for patterns -that begin with a literal "!", for example, "\!important!.<code>txt</code>".</p> +Put a backslash ("<code>\</code>") in front of the first "!" for patterns +that begin with a literal "!", for example, "<code>\</code>!important!.<code>txt</code>".</p> </li> <li> <p>The slash "<code>/</code>" is used as the directory separator. Separators may @@ -584,7 +584,7 @@ the .<code>gitignore</code> file).</p> </li> <li> -<p>An asterisk "*" matches anything except a slash. +<p>An asterisk "<code>*</code>" matches anything except a slash. The character "?" matches any one character except "<code>/</code>". The range notation, e.g. [<code>a-zA-Z</code>], can be used to match one of the characters in a range. See fnmatch(3) and the @@ -593,26 +593,26 @@ </ul> </div> <div class="paragraph"> -<p>Two consecutive asterisks ("**") in patterns matched against +<p>Two consecutive asterisks ("<code>**</code>") in patterns matched against full pathname may have special meaning:</p> </div> <div class="ulist"> <ul> <li> -<p>A leading "**" followed by a slash means match in all -directories. For example, "**/foo" matches file or directory -"<code>foo</code>" anywhere, the same as pattern "<code>foo</code>". "**/foo/bar" +<p>A leading "<code>**</code>" followed by a slash means match in all +directories. For example, "<code>**/foo</code>" matches file or directory +"<code>foo</code>" anywhere, the same as pattern "<code>foo</code>". "<code>**/foo/bar</code>" matches file or directory "<code>bar</code>" anywhere that is directly under directory "<code>foo</code>".</p> </li> <li> -<p>A trailing "<code>/</code>**" matches everything inside. For example, -"<code>abc/</code>**" matches all files inside directory "<code>abc</code>", relative +<p>A trailing "<code>/**</code>" matches everything inside. For example, +"<code>abc/**</code>" matches all files inside directory "<code>abc</code>", relative to the location of the .<code>gitignore</code> file, with infinite depth.</p> </li> <li> <p>A slash followed by two consecutive asterisks then a slash -matches zero or more directories. For example, "<code>a/</code>**/b" +matches zero or more directories. For example, "<code>a/**/b</code>" matches "<code>a/b</code>", "<code>a/x/b</code>", "<code>a/x/y/b</code>" and so on.</p> </li> <li> @@ -660,10 +660,10 @@ <div class="ulist"> <ul> <li> -<p>The pattern <code>hello.</code>* matches any file or directory +<p>The pattern <code>hello.*</code> matches any file or directory whose name begins with <code>hello.</code>. If one wants to restrict this only to the directory and not in its subdirectories, -one can prepend the pattern with a slash, i.e. <code>/hello.</code>*; +one can prepend the pattern with a slash, i.e. <code>/hello.*</code>; the pattern now matches <code>hello.txt</code>, <code>hello.c</code> but not <code>a/hello.java</code>.</p> </li> @@ -680,7 +680,7 @@ the pattern.</p> </li> <li> -<p>The pattern <code>foo/</code>*, matches <code>foo/test.json</code> +<p>The pattern <code>foo/*</code>, matches <code>foo/test.json</code> (a regular file), <code>foo/bar</code> (a directory), but it does not match <code>foo/bar/hello.c</code> (a regular file), as the asterisk in the pattern does not match <code>bar/hello.c</code> which has a slash in it.</p> @@ -733,7 +733,7 @@ </div> <div class="paragraph"> <p>Example to exclude everything except a specific directory <code>foo/bar</code> -(note the <code>/</code>* - without the slash, the wildcard would also exclude +(note the <code>/*</code> - without the slash, the wildcard would also exclude everything within <code>foo/bar</code>):</p> </div> <div class="listingblock"> diff --git a/gitpacking.html b/gitpacking.html index 12dea03..1fe05b1 100644 --- a/gitpacking.html +++ b/gitpacking.html
@@ -603,7 +603,7 @@ </div> <div class="paragraph"> <p>The size of groups is determined by a power-law decay function, and the -decay parameter roughly corresponds to "k" in <code>f</code>(<code>n</code>) <code>=</code> <code>C</code>*n^(<code>-k/100</code>), +decay parameter roughly corresponds to "k" in <code>f</code>(<code>n</code>) <code>=</code> <code>C*n^</code>(<code>-k/100</code>), where <code>f</code>(<code>n</code>) describes the size of the <code>n</code>-th pseudo-merge group. The sample rate controls what percentage of eligible commits are considered as candidates. The threshold parameter indicates the minimum age (so as @@ -627,7 +627,7 @@ <div class="title">Note</div> </td> <td class="content"> -The configuration options in <code>bitmapPseudoMerge.</code>* are considered +The configuration options in <code>bitmapPseudoMerge.*</code> are considered EXPERIMENTAL and may be subject to change or be removed entirely in the future. For more information about the pseudo-merge bitmap feature, see the "Pseudo-merge bitmaps" section of <a href="gitpacking.html">gitpacking(7)</a>. @@ -669,7 +669,7 @@ <dd> <p>Determines the rate at which consecutive pseudo-merge bitmap groups decrease in size. Must be non-negative. This parameter -can be thought of as <code>k</code> in the function <code>f</code>(<code>n</code>) <code>=</code> <code>C</code> * <code>n^-k</code>, +can be thought of as <code>k</code> in the function <code>f</code>(<code>n</code>) <code>=</code> <code>C</code> <code>*</code> <code>n^-k</code>, where <code>f</code>(<code>n</code>) is the size of the `n`th group.</p> <div class="paragraph"> <p>Setting the decay rate equal to <code>0</code> will cause all groups to be the
diff --git a/gitprotocol-common.html b/gitprotocol-common.html index edd19b6..bab0ee6 100644 --- a/gitprotocol-common.html +++ b/gitprotocol-common.html
@@ -508,12 +508,12 @@ restricted.</p> </li> <li> -<p>They cannot have two consecutive dots .. anywhere.</p> +<p>They cannot have two consecutive dots <code>..</code> anywhere.</p> </li> <li> <p>They cannot have ASCII control characters (i.e. bytes whose values are lower than \040, or \177 <code>DEL</code>), space, tilde <code>~</code>, -caret <code>^</code>, colon <code>:</code>, question-mark ?, asterisk *, +caret <code>^</code>, colon <code>:</code>, question-mark ?, asterisk <code>*</code>, or open bracket [ anywhere.</p> </li> <li> @@ -526,7 +526,7 @@ <p>They cannot contain a sequence <code>@</code>{.</p> </li> <li> -<p>They cannot contain a \\.</p> +<p>They cannot contain a <code>\\</code>.</p> </li> </ol> </div> @@ -605,7 +605,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2025-02-14 21:38:14 -0800 +Last updated 2025-03-26 00:41:02 -0700 </div> </div> </body> diff --git a/gitprotocol-v2.html b/gitprotocol-v2.html index fda2136..5755b64 100644 --- a/gitprotocol-v2.html +++ b/gitprotocol-v2.html
@@ -1331,7 +1331,7 @@ <p>When the client issues a <code>command=bundle-uri</code> request, the response is a list of key-value pairs provided as packet lines with value <em><key></em><code>=</code><em><value></em>. Each <em><key></em> should be interpreted as a config key from -the <code>bundle.</code>* namespace to construct a list of bundles. These keys are +the <code>bundle.*</code> namespace to construct a list of bundles. These keys are grouped by a <code>bundle.</code><em><id></em>. subsection, where each key corresponding to a given <em><id></em> contributes attributes to the bundle defined by that <em><id></em>. See <a href="git-config.html">git-config(1)</a> for the specific details of these keys and how @@ -1360,7 +1360,7 @@ <div class="paragraph"> <p>The advertised URI may alternatively contain a plaintext file that <code>git</code> <code>config</code> <code>--list</code> would accept (with the <code>--file</code> option). The key-value -pairs in this list are in the <code>bundle.</code>* namespace (see +pairs in this list are in the <code>bundle.*</code> namespace (see <a href="git-config.html">git-config(1)</a>).</p> </div> </dd> @@ -1461,7 +1461,7 @@ <h4 id="_bundle_uri_protocol_features">bundle-uri PROTOCOL FEATURES</h4> <div class="paragraph"> <p>The client constructs a bundle list from the <em><key></em><code>=</code><em><value></em> pairs -provided by the server. These pairs are part of the <code>bundle.</code>* namespace +provided by the server. These pairs are part of the <code>bundle.*</code> namespace as documented in <a href="git-config.html">git-config(1)</a>. In this section, we discuss some of these keys and describe the actions the client will do in response to this information.</p>
diff --git a/gitremote-helpers.html b/gitremote-helpers.html index ef719d5..a2561d5 100644 --- a/gitremote-helpers.html +++ b/gitremote-helpers.html
@@ -691,7 +691,7 @@ capability use this. It’s mandatory for <em>export</em>.</p> <div class="paragraph"> <p>A helper advertising the capability -<code>refspec</code> <code>refs/heads/</code>*:refs/svn/origin/branches/* +<code>refspec</code> <code>refs/heads/*:refs/svn/origin/branches/*</code> is saying that, when it is asked to <code>import</code> <code>refs/heads/topic</code>, the stream it outputs will update the <code>refs/svn/origin/branches/topic</code> ref.</p> @@ -701,7 +701,7 @@ applicable refspec takes precedence. The left-hand of refspecs advertised with this capability must cover all refs reported by the list command. If no <em>refspec</em> capability is advertised, -there is an implied <code>refspec</code> *:*.</p> +there is an implied <code>refspec</code> <code>*:*</code>.</p> </div> <div class="paragraph"> <p>When writing remote-helpers for decentralized version control
diff --git a/gitrepository-layout.html b/gitrepository-layout.html index eaa1893..127c98b 100644 --- a/gitrepository-layout.html +++ b/gitrepository-layout.html
@@ -884,7 +884,7 @@ configuration file.</p> </li> <li> -<p>If a version-1 repository specifies any <code>extensions.</code>* keys that +<p>If a version-1 repository specifies any <code>extensions.*</code> keys that the running git has not implemented, the operation MUST NOT proceed. Similarly, if the value of any known key is not understood by the implementation, the operation MUST NOT proceed.</p> @@ -898,7 +898,7 @@ implementations of git).</p> </div> <div class="paragraph"> -<p>The defined extensions are given in the <code>extensions.</code>* section of +<p>The defined extensions are given in the <code>extensions.*</code> section of <a href="git-config.html">git-config(1)</a>. Any implementation wishing to define a new extension should make a note of it there, in order to claim the name.</p> </div>
diff --git a/gitsubmodules.html b/gitsubmodules.html index 485dad1..6a850bf 100644 --- a/gitsubmodules.html +++ b/gitsubmodules.html
@@ -491,7 +491,7 @@ superproject expects the submodule’s working directory to be at.</p> </div> <div class="paragraph"> -<p>The section <code>submodule.foo.</code>* in the .<code>gitmodules</code> file gives additional +<p>The section <code>submodule.foo.*</code> in the .<code>gitmodules</code> file gives additional hints to Git’s porcelain layer. For example, the <code>submodule.foo.url</code> setting specifies where to obtain the submodule.</p> </div>
diff --git a/gitweb.html b/gitweb.html index 9eb2a50..a96321d 100644 --- a/gitweb.html +++ b/gitweb.html
@@ -797,7 +797,7 @@ value from this file for given repository.</p> </div> </dd> -<dt class="hdlist1">various <code>gitweb.</code>* config variables (in config)</dt> +<dt class="hdlist1">various <code>gitweb.*</code> config variables (in config)</dt> <dd> <p>Read description of %feature hash for detailed list, and descriptions. See also "Configuring gitweb features" section in <a href="gitweb.conf.html">gitweb.conf(5)</a></p> @@ -1379,7 +1379,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2025-02-14 21:38:14 -0800 +Last updated 2025-03-26 00:41:02 -0700 </div> </div> </body>
diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index e837a85..89fb366 100644 --- a/howto/recover-corrupted-object-harder.html +++ b/howto/recover-corrupted-object-harder.html
@@ -679,7 +679,7 @@ </div> </div> <div class="paragraph"> -<p>The \xc7 comes from the replacement byte our "munge" program found. +<p>The <code>\xc7</code> comes from the replacement byte our "munge" program found. The offset 51659518 is derived by taking the original object offset (51653873), adding the replacement offset found by "munge" (5642), and then adding back in the 3 bytes of git header we stripped.</p> @@ -965,7 +965,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2025-03-14 09:40:28 -0700 +Last updated 2025-04-23 15:23:09 -0700 </div> </div> </body>
diff --git a/technical/api-parse-options.html b/technical/api-parse-options.html index daa013c..19064d7 100644 --- a/technical/api-parse-options.html +++ b/technical/api-parse-options.html
@@ -565,7 +565,7 @@ </li> <li> <p>define a NULL-terminated -<code>static</code> <code>const</code> <code>char</code> * <code>const</code> <code>builtin_foo_usage</code>[] array +<code>static</code> <code>const</code> <code>char</code> <code>*</code> <code>const</code> <code>builtin_foo_usage</code>[] array containing alternative usage strings</p> </li> <li> @@ -573,7 +573,7 @@ in section <em>Data Structure</em>.</p> </li> <li> -<p>in <code>cmd_foo</code>(<code>int</code> <code>argc,</code> <code>const</code> <code>char</code> **argv, <code>const</code> <code>char</code> *prefix) +<p>in <code>cmd_foo</code>(<code>int</code> <code>argc,</code> <code>const</code> <code>char</code> <code>**argv,</code> <code>const</code> <code>char</code> <code>*prefix</code>) call</p> <div class="literalblock"> <div class="content"> @@ -839,12 +839,12 @@ <p><code>int_var</code> is an integer variable,</p> </li> <li> -<p><code>str_var</code> is a string variable (<code>char</code> *),</p> +<p><code>str_var</code> is a string variable (<code>char</code> <code>*</code>),</p> </li> <li> <p><code>arg_str</code> is the string that is shown as argument (e.g. "branch" will result in <em><branch></em>). -If set to <code>NULL</code>, three dots (...) will be displayed.</p> +If set to <code>NULL</code>, three dots (<code>...</code>) will be displayed.</p> </li> <li> <p><code>description</code> is a short string to describe the effect of the option. @@ -874,9 +874,9 @@ <li> <p>Inside <code>func</code>, the only interesting member of the structure given by <code>opt</code> is the void pointer <code>opt-</code>><code>value</code>. -*opt-><code>value</code> will be the value that is saved into <code>var</code>, if you +<code>*opt-</code>><code>value</code> will be the value that is saved into <code>var</code>, if you use <code>OPT_CALLBACK</code>(). -For example, do *(<code>unsigned</code> <code>long</code> *)<code>opt-</code>><code>value</code> <code>=</code> <code>42</code>; to get 42 +For example, do <code>*</code>(<code>unsigned</code> <code>long</code> <code>*</code>)<code>opt-</code>><code>value</code> <code>=</code> <code>42</code>; to get 42 into an <code>unsigned</code> <code>long</code> variable.</p> </li> <li>
diff --git a/technical/api-trace2.html b/technical/api-trace2.html index 871e19f..1288e29 100644 --- a/technical/api-trace2.html +++ b/technical/api-trace2.html
@@ -469,8 +469,8 @@ for example.</p> </div> <div class="paragraph"> -<p>Trace2 is controlled using <code>trace2.</code>* config values in the system and -global config files and <code>GIT_TRACE2</code>* environment variables. Trace2 does +<p>Trace2 is controlled using <code>trace2.*</code> config values in the system and +global config files and <code>GIT_TRACE2*</code> environment variables. Trace2 does not read from repo local or worktree config files, nor does it respect <code>-c</code> command line config settings.</p> </div>
diff --git a/technical/bitmap-format.html b/technical/bitmap-format.html index 4ec14f5..80f2ce7 100644 --- a/technical/bitmap-format.html +++ b/technical/bitmap-format.html
@@ -846,7 +846,7 @@ <h2 id="_commit_lookup_table">Commit lookup table</h2> <div class="sectionbody"> <div class="paragraph"> -<p>If the BITMAP_OPT_LOOKUP_TABLE flag is set, the last <code>N</code> * (<code>4</code> <code>+</code> <code>8</code> <code>+</code> <code>4</code>) +<p>If the BITMAP_OPT_LOOKUP_TABLE flag is set, the last <code>N</code> <code>*</code> (<code>4</code> <code>+</code> <code>8</code> <code>+</code> <code>4</code>) bytes (preceding the name-hash cache and trailing hash) of the .<code>bitmap</code> file contains a lookup table specifying the information needed to get the desired bitmap from the entries without parsing previous unnecessary
diff --git a/technical/bundle-uri.html b/technical/bundle-uri.html index 082eaea..e050629 100644 --- a/technical/bundle-uri.html +++ b/technical/bundle-uri.html
@@ -756,11 +756,11 @@ client delays unbundling until other bundles have been unbundled, making those OIDs present. When all required OIDs are present, the client unbundles that data using a refspec. The default refspec is -<code>+refs/heads/</code>*:refs/bundles/*, but this can be configured. These refs +<code>+refs/heads/*:refs/bundles/*</code>, but this can be configured. These refs are stored so that later <code>git</code> <code>fetch</code> negotiations can communicate each bundled ref as a <code>have</code>, reducing the size of the fetch over the Git protocol. To allow pruning refs from this ref namespace, Git may -introduce a numbered namespace (such as <code>refs/bundles/</code><em><i></em><code>/</code>*) such that +introduce a numbered namespace (such as <code>refs/bundles/</code><em><i></em><code>/*</code>) such that stale bundle refs can be deleted.</p> </li> <li> @@ -892,7 +892,7 @@ <p>The downloaded bundles contain more information than is requested by the clone or fetch request. A primary example is if the user requests a clone with <code>--single-branch</code> but downloads bundles that store every -reachable commit from all <code>refs/heads/</code>* references. This might be +reachable commit from all <code>refs/heads/*</code> references. This might be initially wasteful, but perhaps these objects will become reachable by a later ref update that the client cares about.</p> </li>
diff --git a/technical/hash-function-transition.html b/technical/hash-function-transition.html index da47eb3..27ea372 100644 --- a/technical/hash-function-transition.html +++ b/technical/hash-function-transition.html
@@ -710,7 +710,7 @@ </div> <div class="paragraph"> <p>The combination of setting <code>core.repositoryFormatVersion=1</code> and -populating <code>extensions.</code>* ensures that all versions of Git later than +populating <code>extensions.*</code> ensures that all versions of Git later than <code>v0.99.9l</code> will die instead of trying to operate on the SHA-256 repository, instead producing an error message.</p> </div>
diff --git a/technical/multi-pack-index.html b/technical/multi-pack-index.html index 469e5a6..efe6542 100644 --- a/technical/multi-pack-index.html +++ b/technical/multi-pack-index.html
@@ -604,7 +604,7 @@ </div> <div class="paragraph"> <p>The layout will then be extended so that each layer of the incremental -MIDX chain can write a *.<code>bitmap</code>. The objects in each layer’s bitmap +MIDX chain can write a <code>*.bitmap</code>. The objects in each layer’s bitmap are offset by the number of objects in the previous layers of the chain.</p> </div> </li> @@ -731,10 +731,10 @@ <div class="paragraph"> <p>Each layer of an incremental MIDX chain may have its objects (and the objects from any previous layer in the same MIDX chain) represented in -its own *.<code>bitmap</code> file.</p> +its own <code>*.bitmap</code> file.</p> </div> <div class="paragraph"> -<p>The structure of a *.<code>bitmap</code> file belonging to an incremental MIDX +<p>The structure of a <code>*.bitmap</code> file belonging to an incremental MIDX chain is identical to that of a non-incremental MIDX bitmap, or a classic single-pack bitmap. Since objects are added to the end of the incremental MIDX’s pseudo-pack order (see above), it is possible to @@ -742,8 +742,8 @@ </div> <div class="paragraph"> <p>(Note: it is possible likewise to compress a contiguous sequence of MIDX -incremental layers, and their *.<code>bitmap</code> files into a single layer and -*.<code>bitmap</code>, but this is not yet implemented.)</p> +incremental layers, and their <code>*.bitmap</code> files into a single layer and +<code>*.bitmap</code>, but this is not yet implemented.)</p> </div> <div class="paragraph"> <p>The object positions used are global within the pseudo-pack order, so
diff --git a/technical/reftable.html b/technical/reftable.html index 20fb734..a557d5d 100644 --- a/technical/reftable.html +++ b/technical/reftable.html
@@ -1211,7 +1211,7 @@ <p>Log blocks are variable in size, and do not match the <code>block_size</code> specified in the file header or footer. Writers should choose an appropriate buffer size to prepare a log block for deflation, such as -<code>2</code> * <code>block_size</code>.</p> +<code>2</code> <code>*</code> <code>block_size</code>.</p> </div> <div class="paragraph"> <p>A log block is written as:</p> @@ -1393,7 +1393,7 @@ <h4 id="_log_index">Log index</h4> <div class="paragraph"> <p>The log index stores the log key -(<code>refname</code> \0 <code>reverse_int64</code>(<code>update_index</code>)) for the last log record of +(<code>refname</code> <code>\0</code> <code>reverse_int64</code>(<code>update_index</code>)) for the last log record of every log block in the file, supporting bounded-time lookup.</p> </div> <div class="paragraph"> @@ -1862,7 +1862,7 @@ <p>refresh the reftable stack, by reading <code>tables.list</code></p> </li> <li> -<p>for each *.<code>ref</code> file, remove it if</p> +<p>for each <code>*.ref</code> file, remove it if</p> <div class="ulist"> <ul> <li>
diff --git a/user-manual.html b/user-manual.html index 2f8b4bb..d586f2a 100644 --- a/user-manual.html +++ b/user-manual.html
@@ -549,7 +549,7 @@ e05db0fd4f31dde7005f075a84f96b360d05984b $ git rev-list master e05db0fd4f31dde7005f075a84f96b360d05984b</pre> -<p>Or you could recall that the ... operator selects all commits +<p>Or you could recall that the <code class="literal">...</code> operator selects all commits reachable from either one reference or the other but not both; so</p> <pre class="screen">$ git log origin...master</pre> @@ -1199,7 +1199,7 @@ accomplish the above with just a simple</p> <pre class="screen">$ git pull</pre> <p>This command will fetch changes from the remote branches to your -remote-tracking branches <code class="literal">origin/</code>*, and merge the default branch into +remote-tracking branches <code class="literal">origin/*</code>, and merge the default branch into the current branch.</p> <p>More generally, a branch that is created from a remote-tracking branch will pull @@ -2990,7 +2990,7 @@ structures in <code class="literal">read-cache-ll.h</code>), and that there are just a couple of object types (blobs, trees, commits and tags) which inherit their common structure from <code class="literal">struct</code> <code class="literal">object</code>, which is their first member -(and thus, you can cast e.g. (<code class="literal">struct</code> <code class="literal">object</code> *)<code class="literal">commit</code> to achieve the +(and thus, you can cast e.g. (<code class="literal">struct</code> <code class="literal">object</code> <code class="literal">*</code>)<code class="literal">commit</code> to achieve the <span class="emphasis"><em>same</em></span> as &commit-><code class="literal">object</code>, i.e. get at the object name and flags).</p> <p>Now is a good point to take a break to let this information sink in.</p> <p>Next step: get familiar with the object naming. Read <a class="xref" href="#naming-commits" title="Naming commits">the section called “Naming commits”</a>. @@ -3076,11 +3076,11 @@ negative numbers in case of different errors—and 0 on success. </li><li class="listitem"> the variable <code class="literal">sha1</code> in the function signature of <code class="literal">get_sha1</code>() is <code class="literal">unsigned</code> -<code class="literal">char</code> *, but is actually expected to be a pointer to <code class="literal">unsigned</code> +<code class="literal">char</code> <code class="literal">*</code>, but is actually expected to be a pointer to <code class="literal">unsigned</code> <code class="literal">char</code>[<code class="literal">20</code>]. This variable will contain the 160-bit SHA-1 of the given -commit. Note that whenever a SHA-1 is passed as <code class="literal">unsigned</code> <code class="literal">char</code> *, it +commit. Note that whenever a SHA-1 is passed as <code class="literal">unsigned</code> <code class="literal">char</code> <code class="literal">*</code>, it is the binary representation, as opposed to the ASCII representation in -hex characters, which is passed as <code class="literal">char</code> *. +hex characters, which is passed as <code class="literal">char</code> <code class="literal">*</code>. </li></ul></div> <p>You will see both of these things throughout the code.</p> <p>Now, for the meat:</p> @@ -3451,7 +3451,7 @@ match from the root of the working tree, even when you are running the command from inside a subdirectory. </dd><dt><span class="term">literal</span></dt><dd> -Wildcards in the pattern such as * or ? are treated +Wildcards in the pattern such as <code class="literal">*</code> or ? are treated as literal characters. </dd><dt><span class="term">icase</span></dt><dd> Case insensitive match. @@ -3462,21 +3462,21 @@ For example, "Documentation/*.html" matches "Documentation/git.html" but not "Documentation/ppc/ppc.html" or "tools/perf/Documentation/perf.html".</p> -<p class="simpara">Two consecutive asterisks ("**") in patterns matched against +<p class="simpara">Two consecutive asterisks ("<code class="literal">**</code>") in patterns matched against full pathname may have special meaning:</p> <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"> -A leading "**" followed by a slash means match in all -directories. For example, "**/foo" matches file or directory -"<code class="literal">foo</code>" anywhere, the same as pattern "<code class="literal">foo</code>". "**/foo/bar" +A leading "<code class="literal">**</code>" followed by a slash means match in all +directories. For example, "<code class="literal">**/foo</code>" matches file or directory +"<code class="literal">foo</code>" anywhere, the same as pattern "<code class="literal">foo</code>". "<code class="literal">**/foo/bar</code>" matches file or directory "<code class="literal">bar</code>" anywhere that is directly under directory "<code class="literal">foo</code>". </li><li class="listitem"> -A trailing "<code class="literal">/</code>**" matches everything inside. For example, -"<code class="literal">abc/</code>**" matches all files inside directory "abc", relative +A trailing "<code class="literal">/**</code>" matches everything inside. For example, +"<code class="literal">abc/**</code>" matches all files inside directory "abc", relative to the location of the .<code class="literal">gitignore</code> file, with infinite depth. </li><li class="listitem"> A slash followed by two consecutive asterisks then a slash -matches zero or more directories. For example, "<code class="literal">a/</code>**/b" +matches zero or more directories. For example, "<code class="literal">a/**/b</code>" matches "<code class="literal">a/b</code>", "<code class="literal">a/x/b</code>", "<code class="literal">a/x/y/b</code>" and so on. </li><li class="listitem"> <p class="simpara">Other consecutive asterisks are considered invalid.</p> 